hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ktest.pl: Define PRE_TEST_DIE to kill the test if the PRE_TEST fails 

Currently, if a PRE_TEST is defined and ran, but fails, there's nothing
currently available to make the test fail too. Add a PRE_TEST_DIE option that
when set, if a PRE_TEST is defined and fails, the test will die too.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (VMware) 2020-07-01 10:32:28 -04:00
parent 2f059db0b8
commit d53cdda3fd
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/testing/ktest/ktest.pl
View File

@ -98,6 +98,7 @@ my $final_post_ktest;
my $pre_ktest; my $pre_ktest;
my $post_ktest; my $post_ktest;
my $pre_test; my $pre_test;
my $pre_test_die;
my $post_test; my $post_test;
my $pre_build; my $pre_build;
my $post_build; my $post_build;
@ -273,6 +274,7 @@ my %option_map = (
"PRE_KTEST" => \$pre_ktest, "PRE_KTEST" => \$pre_ktest,
"POST_KTEST" => \$post_ktest, "POST_KTEST" => \$post_ktest,
"PRE_TEST" => \$pre_test, "PRE_TEST" => \$pre_test,
"PRE_TEST_DIE" => \$pre_test_die,
"POST_TEST" => \$post_test, "POST_TEST" => \$post_test,
"BUILD_TYPE" => \$build_type, "BUILD_TYPE" => \$build_type,
"BUILD_OPTIONS" => \$build_options, "BUILD_OPTIONS" => \$build_options,
@ -4347,7 +4349,11 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
doprint "RUNNING TEST $i of $opt{NUM_TESTS}$name with option $test_type $run_type$installme\n\n"; doprint "RUNNING TEST $i of $opt{NUM_TESTS}$name with option $test_type $run_type$installme\n\n";
if (defined($pre_test)) { if (defined($pre_test)) {
run_command $pre_test; my $ret = run_command $pre_test;
if (!$ret && defined($pre_test_die) &&
$pre_test_die) {
dodie "failed to pre_test\n";
}
} }
unlink $dmesg; unlink $dmesg;

5
tools/testing/ktest/sample.conf
View File

@ -557,6 +557,11 @@
# default (undefined) # default (undefined)
#PRE_TEST = ${SSH} reboot_to_special_kernel #PRE_TEST = ${SSH} reboot_to_special_kernel
# To kill the entire test if PRE_TEST is defined but fails set this
# to 1.
# (default 0)
#PRE_TEST_DIE = 1
# If there is a command you want to run after the individual test case # If there is a command you want to run after the individual test case
# completes, then you can set this option. # completes, then you can set this option.
# #