Commit 5d48421b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Add INGORE_ERRORS to ignore warnings in boot up
  ktest: Still do reboot even for REBOOT_TYPE = script
  ktest: Fix compare script to test if options are not documented
  ktest: Detect typos in option names
  ktest: Have all values be set by defaults
  ktest: Change initialization of defaults hash to perl format
  ktest: Add options SWITCH_TO_GOOD and SWITCH_TO_TEST
  ktest: Allow overriding bisect test results
  ktest: Evaluate options before processing them
  ktest: Evaluate $KERNEL_VERSION in both install and post install
  ktest: Only ask options needed for install
  ktest: When creating a new config, ask for BUILD_OPTIONS
  ktest: Do not ask for some options if the only test is build
  ktest: Ask for type of test when creating a new config
  ktest: Allow bisect test to restart where it left off
  ktest: When creating new config, allow the use of ${THIS_DIR}
  ktest: Add default for ssh-user, build-target and target-image
  ktest: Allow success logs to be stored
  ktest: Save test output
parents 6e03db2b be405f95

tools/testing/ktest/compare-ktest-sample.pl

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ 


open (IN,"ktest.pl");

while (<IN>) {

    # hashes are now used

    if (/\$opt\{"?([A-Z].*?)(\[.*\])?"?\}/ ||

	/^\s*"?([A-Z].*?)"?\s*=>\s*/ ||

	/set_test_option\("(.*?)"/) {

	$opt{$1} = 1;

    }
@@ -11,7 +13,7 @@ close IN; 


open (IN, "sample.conf");

while (<IN>) {

    if (/^\s*#?\s*(\S+)\s*=/) {

    if (/^\s*#?\s*([A-Z]\S*)\s*=/) {

	$samp{$1} = 1;

    }

}

tools/testing/ktest/ktest.pl

+492 −190

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/ktest/sample.conf

+86 −1
Original line number Diff line number Diff line
@@ -346,7 +346,10 @@ 
#GRUB_MENU = Test Kernel



# A script to reboot the target into the test kernel

# (Only mandatory if REBOOT_TYPE = script)

# This and SWITCH_TO_TEST are about the same, except

# SWITCH_TO_TEST is run even for REBOOT_TYPE = grub.

# This may be left undefined.

# (default undefined)

#REBOOT_SCRIPT =



#### Optional Config Options (all have defaults) ####
@@ -468,6 +471,27 @@ 
# The test will not modify that file.

#REBOOT_TYPE = grub



# If you are using a machine that doesn't boot with grub, and

# perhaps gets its kernel from a remote server (tftp), then

# you can use this option to update the target image with the

# test image.

#

# You could also do the same with POST_INSTALL, but the difference

# between that option and this option is that POST_INSTALL runs

# after the install, where this one runs just before a reboot.

# (default undefined)

#SWITCH_TO_TEST = cp ${OUTPUT_DIR}/${BUILD_TARGET} ${TARGET_IMAGE}



# If you are using a machine that doesn't boot with grub, and

# perhaps gets its kernel from a remote server (tftp), then

# you can use this option to update the target image with the

# the known good image to reboot safely back into.

#

# This option holds a command that will execute before needing

# to reboot to a good known image.

# (default undefined)

#SWITCH_TO_GOOD = ssh ${SSH_USER}/${MACHINE} cp good_image ${TARGET_IMAGE}



# The min config that is needed to build for the machine

# A nice way to create this is with the following:

#
@@ -589,6 +613,12 @@ 
# (default undefined)

#STORE_FAILURES = /home/test/failures



# Directory to store success directories on success. If this is not

# set, the .config, dmesg and bootlog will not be saved if a

# test succeeds.

# (default undefined)

#STORE_SUCCESSES = /home/test/successes



# Build without doing a make mrproper, or removing .config

# (default 0)

#BUILD_NOCLEAN = 0
@@ -700,6 +730,25 @@ 
# (default 1)

#DETECT_TRIPLE_FAULT = 0



# All options in the config file should be either used by ktest

# or could be used within a value of another option. If an option

# in the config file is not used, ktest will warn about it and ask

# if you want to continue.

#

# If you don't care if there are non-used options, enable this

# option. Be careful though, a non-used option is usually a sign

# of an option name being typed incorrectly.

# (default 0)

#IGNORE_UNUSED = 1



# When testing a kernel that happens to have WARNINGs, and call

# traces, ktest.pl will detect these and fail a boot or test run

# due to warnings. By setting this option, ktest will ignore

# call traces, and will not fail a test if the kernel produces

# an oops. Use this option with care.

# (default 0)

#IGNORE_ERRORS = 1



#### Per test run options ####

# The following options are only allowed in TEST_START sections.

# They are ignored in the DEFAULTS sections.
@@ -862,6 +911,42 @@ 
#   BISECT_BAD with BISECT_CHECK = good or

#   BISECT_CHECK = bad, respectively.

#

# BISECT_RET_GOOD = 0 (optional, default undefined)

#

#   In case the specificed test returns something other than just

#   0 for good, and non-zero for bad, you can override 0 being

#   good by defining BISECT_RET_GOOD.

#

# BISECT_RET_BAD = 1 (optional, default undefined)

#

#   In case the specificed test returns something other than just

#   0 for good, and non-zero for bad, you can override non-zero being

#   bad by defining BISECT_RET_BAD.

#

# BISECT_RET_ABORT = 255 (optional, default undefined)

#

#   If you need to abort the bisect if the test discovers something

#   that was wrong, you can define BISECT_RET_ABORT to be the error

#   code returned by the test in order to abort the bisect.

#

# BISECT_RET_SKIP = 2 (optional, default undefined)

#

#   If the test detects that the current commit is neither good

#   nor bad, but something else happened (another bug detected)

#   you can specify BISECT_RET_SKIP to an error code that the

#   test returns when it should skip the current commit.

#

# BISECT_RET_DEFAULT = good (optional, default undefined)

#

#   You can override the default of what to do when the above

#   options are not hit. This may be one of, "good", "bad",

#   "abort" or "skip" (without the quotes).

#

#   Note, if you do not define any of the previous BISECT_RET_*

#   and define BISECT_RET_DEFAULT, all bisects results will do

#   what the BISECT_RET_DEFAULT has.

#

#

# Example:

#   TEST_START

#   TEST_TYPE = bisect

CRA Git | Maintained and supported by SUSTech CRA and CCSE