Commit d53cdda3 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

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: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 2f059db0

tools/testing/ktest/ktest.pl

+7 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ my $final_post_ktest; 
my $pre_ktest;

my $post_ktest;

my $pre_test;

my $pre_test_die;

my $post_test;

my $pre_build;

my $post_build;
@@ -273,6 +274,7 @@ my %option_map = ( 
    "PRE_KTEST"			=> \$pre_ktest,

    "POST_KTEST"		=> \$post_ktest,

    "PRE_TEST"			=> \$pre_test,

    "PRE_TEST_DIE"		=> \$pre_test_die,

    "POST_TEST"			=> \$post_test,

    "BUILD_TYPE"		=> \$build_type,

    "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";



    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;

tools/testing/ktest/sample.conf

+5 −0
Original line number Diff line number Diff line
@@ -557,6 +557,11 @@ 
# default (undefined)

#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

# completes, then you can set this option.

#

CRA Git | Maintained and supported by SUSTech CRA and CCSE