Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96f6a0df authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

ktest: Still do reboot even for REBOOT_TYPE = script 



The REBOOT_TYPE may be either grub or script, if it is script
it is expected that a REBOOT_SCRIPT is defined.

With the SWITCH_TO_TEST which is the complement of SWITCH_TO_GOOD,
which does basically the same thing as REBOOT_SCRIPT and but for
both grub and script, the REBOOT_SCRIPT does not need to be mandatory
anymore.

Do not require the REBOOT_SCRIPT and always run the reboot code
for both grub and script.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent c2857cb4

tools/testing/ktest/ktest.pl

+3 −8
Original line number Diff line number Diff line
@@ -485,8 +485,6 @@ sub get_ktest_configs { 


    if ($rtype eq "grub") {

	get_ktest_config("GRUB_MENU");

    } else {

	get_ktest_config("REBOOT_SCRIPT");

    }

}
@@ -1430,12 +1428,11 @@ sub reboot_to { 


    if ($reboot_type eq "grub") {

	run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";

	reboot;

	return;

    }



    } elsif (defined $reboot_script) {

	run_command "$reboot_script";

    }

    reboot;

}



sub get_sha1 {

    my ($commit) = @_;
@@ -3479,8 +3476,6 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) { 
	$target = "$ssh_user\@$machine";

	if ($reboot_type eq "grub") {

	    dodie "GRUB_MENU not defined" if (!defined($grub_menu));

	} elsif (!defined($reboot_script)) {

	    dodie "REBOOT_SCRIPT not defined"

	}

    }

tools/testing/ktest/sample.conf

+4 −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) ####