Ktest fixes and clean ups
- Make the default option oldconfig instead of randconfig (one too many times I lost my config because I left the build type out) - Add timeout to ssh sync to sync before reboot (prevents test hangs) - A couple of spelling fix patches -----BEGIN PGP SIGNATURE----- iIoEABYIADIWIQRRSw7ePDh/lE+zeZMp5XQQmuv6qgUCXmakcxQccm9zdGVkdEBn b29kbWlzLm9yZwAKCRAp5XQQmuv6qhLKAP9eEZxg0HzIXo3mn9ECcpLaJIKgXGCY Q55z1dN56qliZQD+KcRAB0kA2oxP0tBsJyTrizpJnkldkNrbRd4uJZo/4gA= =sn+K -----END PGP SIGNATURE----- Merge tag 'ktest-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest Pull Ktest fixes and clean ups from Steven Rostedt: - Make the default option oldconfig instead of randconfig (one too many times I lost my config because I left the build type out) - Add timeout to ssh sync to sync before reboot (prevents test hangs) - A couple of spelling fix patches * tag 'ktest-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: ktest: Fix typos in ktest.pl ktest: Add timeout for ssh sync testing ktest: Make default build option oldconfig not randconfig ktest: Fix some typos in sample.conf
This commit is contained in:
Linus Torvalds
Коммит
30bb5572ce
|
|
@ -30,7 +30,7 @@ my %default = (
|
|||
"EMAIL_WHEN_STARTED" => 0,
|
||||
"NUM_TESTS" => 1,
|
||||
"TEST_TYPE" => "build",
|
||||
"BUILD_TYPE" => "randconfig",
|
||||
"BUILD_TYPE" => "oldconfig",
|
||||
"MAKE_CMD" => "make",
|
||||
"CLOSE_CONSOLE_SIGNAL" => "INT",
|
||||
"TIMEOUT" => 120,
|
||||
|
|
@ -1030,7 +1030,7 @@ sub __read_config {
|
|||
}
|
||||
|
||||
if (!$skip && $rest !~ /^\s*$/) {
|
||||
die "$name: $.: Gargbage found after $type\n$_";
|
||||
die "$name: $.: Garbage found after $type\n$_";
|
||||
}
|
||||
|
||||
if ($skip && $type eq "TEST_START") {
|
||||
|
|
@ -1063,7 +1063,7 @@ sub __read_config {
|
|||
}
|
||||
|
||||
if ($rest !~ /^\s*$/) {
|
||||
die "$name: $.: Gargbage found after DEFAULTS\n$_";
|
||||
die "$name: $.: Garbage found after DEFAULTS\n$_";
|
||||
}
|
||||
|
||||
} elsif (/^\s*INCLUDE\s+(\S+)/) {
|
||||
|
|
@ -1154,7 +1154,7 @@ sub __read_config {
|
|||
# on of these sections that have SKIP defined.
|
||||
# The save variable can be
|
||||
# defined multiple times and the new one simply overrides
|
||||
# the prevous one.
|
||||
# the previous one.
|
||||
set_variable($lvalue, $rvalue);
|
||||
|
||||
} else {
|
||||
|
|
@ -1234,7 +1234,7 @@ sub read_config {
|
|||
foreach my $option (keys %not_used) {
|
||||
print "$option\n";
|
||||
}
|
||||
print "Set IGRNORE_UNUSED = 1 to have ktest ignore unused variables\n";
|
||||
print "Set IGNORE_UNUSED = 1 to have ktest ignore unused variables\n";
|
||||
if (!read_yn "Do you want to continue?") {
|
||||
exit -1;
|
||||
}
|
||||
|
|
@ -1345,7 +1345,7 @@ sub eval_option {
|
|||
# Check for recursive evaluations.
|
||||
# 100 deep should be more than enough.
|
||||
if ($r++ > 100) {
|
||||
die "Over 100 evaluations accurred with $option\n" .
|
||||
die "Over 100 evaluations occurred with $option\n" .
|
||||
"Check for recursive variables\n";
|
||||
}
|
||||
$prev = $option;
|
||||
|
|
@ -1383,7 +1383,7 @@ sub reboot {
|
|||
|
||||
} else {
|
||||
# Make sure everything has been written to disk
|
||||
run_ssh("sync");
|
||||
run_ssh("sync", 10);
|
||||
|
||||
if (defined($time)) {
|
||||
start_monitor;
|
||||
|
|
@ -1461,7 +1461,7 @@ sub get_test_name() {
|
|||
|
||||
sub dodie {
|
||||
|
||||
# avoid recusion
|
||||
# avoid recursion
|
||||
return if ($in_die);
|
||||
$in_die = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
|
||||
# Options set in the beginning of the file are considered to be
|
||||
# default options. These options can be overriden by test specific
|
||||
# default options. These options can be overridden by test specific
|
||||
# options, with the following exceptions:
|
||||
#
|
||||
# LOG_FILE
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
#
|
||||
# This config file can also contain "config variables".
|
||||
# These are assigned with ":=" instead of the ktest option
|
||||
# assigment "=".
|
||||
# assignment "=".
|
||||
#
|
||||
# The difference between ktest options and config variables
|
||||
# is that config variables can be used multiple times,
|
||||
|
|
@ -263,7 +263,7 @@
|
|||
#### Using options in other options ####
|
||||
#
|
||||
# Options that are defined in the config file may also be used
|
||||
# by other options. All options are evaulated at time of
|
||||
# by other options. All options are evaluated at time of
|
||||
# use (except that config variables are evaluated at config
|
||||
# processing time).
|
||||
#
|
||||
|
|
@ -505,7 +505,7 @@
|
|||
#TEST = ssh user@machine /root/run_test
|
||||
|
||||
# The build type is any make config type or special command
|
||||
# (default randconfig)
|
||||
# (default oldconfig)
|
||||
# nobuild - skip the clean and build step
|
||||
# useconfig:/path/to/config - use the given config and run
|
||||
# oldconfig on it.
|
||||
|
|
@ -707,7 +707,7 @@
|
|||
|
||||
# Line to define a successful boot up in console output.
|
||||
# This is what the line contains, not the entire line. If you need
|
||||
# the entire line to match, then use regural expression syntax like:
|
||||
# the entire line to match, then use regular expression syntax like:
|
||||
# (do not add any quotes around it)
|
||||
#
|
||||
# SUCCESS_LINE = ^MyBox Login:$
|
||||
|
|
@ -839,7 +839,7 @@
|
|||
# (ignored if POWEROFF_ON_SUCCESS is set)
|
||||
#REBOOT_ON_SUCCESS = 1
|
||||
|
||||
# In case there are isses with rebooting, you can specify this
|
||||
# In case there are issues with rebooting, you can specify this
|
||||
# to always powercycle after this amount of time after calling
|
||||
# reboot.
|
||||
# Note, POWERCYCLE_AFTER_REBOOT = 0 does NOT disable it. It just
|
||||
|
|
@ -848,7 +848,7 @@
|
|||
# (default undefined)
|
||||
#POWERCYCLE_AFTER_REBOOT = 5
|
||||
|
||||
# In case there's isses with halting, you can specify this
|
||||
# In case there's issues with halting, you can specify this
|
||||
# to always poweroff after this amount of time after calling
|
||||
# halt.
|
||||
# Note, POWEROFF_AFTER_HALT = 0 does NOT disable it. It just
|
||||
|
|
@ -972,7 +972,7 @@
|
|||
#
|
||||
# PATCHCHECK_START is required and is the first patch to
|
||||
# test (the SHA1 of the commit). You may also specify anything
|
||||
# that git checkout allows (branch name, tage, HEAD~3).
|
||||
# that git checkout allows (branch name, tag, HEAD~3).
|
||||
#
|
||||
# PATCHCHECK_END is the last patch to check (default HEAD)
|
||||
#
|
||||
|
|
@ -994,7 +994,7 @@
|
|||
# IGNORE_WARNINGS is set for the given commit's sha1
|
||||
#
|
||||
# IGNORE_WARNINGS can be used to disable the failure of patchcheck
|
||||
# on a particuler commit (SHA1). You can add more than one commit
|
||||
# on a particular commit (SHA1). You can add more than one commit
|
||||
# by adding a list of SHA1s that are space delimited.
|
||||
#
|
||||
# If BUILD_NOCLEAN is set, then make mrproper will not be run on
|
||||
|
|
@ -1093,7 +1093,7 @@
|
|||
# whatever reason. (Can't reboot, want to inspect each iteration)
|
||||
# Doing a BISECT_MANUAL will have the test wait for you to
|
||||
# tell it if the test passed or failed after each iteration.
|
||||
# This is basicall the same as running git bisect yourself
|
||||
# This is basically the same as running git bisect yourself
|
||||
# but ktest will rebuild and install the kernel for you.
|
||||
#
|
||||
# BISECT_CHECK = 1 (optional, default 0)
|
||||
|
|
@ -1239,7 +1239,7 @@
|
|||
#
|
||||
# CONFIG_BISECT_EXEC (optional)
|
||||
# The config bisect is a separate program that comes with ktest.pl.
|
||||
# By befault, it will look for:
|
||||
# By default, it will look for:
|
||||
# `pwd`/config-bisect.pl # the location ktest.pl was executed from.
|
||||
# If it does not find it there, it will look for:
|
||||
# `dirname <ktest.pl>`/config-bisect.pl # The directory that holds ktest.pl
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче