Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ktest: Include monitor in reboot code

Browse source 
Several places that call reboot do the same thing with respect to the
monitor. By adding this code into the reboot code, redundant code is
removed and it paves the way for the the reset time patch.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Link: http://lkml.kernel.org/r/1313155932-20092-4-git-send-email-drjones@redhat.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Andrew Jones 2011-08-12 15:32:05 +02:00 committed by Steven Rostedt
parent 134882311c
commit 2728be418d
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tools/testing/ktest/ktest.pl
View file

@ -603,8 +603,13 @@ sub doprint {
}
sub run_command;
sub start_monitor;
sub end_monitor;
sub wait_for_monitor;
sub reboot {
my ($time) = @_;
# try to reboot normally
if (run_command $reboot) {
if (defined($powercycle_after_reboot)) {
@ -615,6 +620,12 @@ sub reboot {
# nope? power cycle it.
run_command "$power_cycle";
}
if (defined($time)) {
start_monitor;
wait_for_monitor $time;
end_monitor;
}
}
sub do_not_reboot {
@ -719,10 +730,7 @@ sub fail {
# no need to reboot for just building.
if (!do_not_reboot) {
doprint "REBOOTING\n";
reboot;
start_monitor;
wait_for_monitor $sleep_time;
end_monitor;
reboot $sleep_time;
}
my $name = "";
@ -1356,10 +1364,7 @@ sub success {
if ($i != $opt{"NUM_TESTS"} && !do_not_reboot) {
doprint "Reboot and wait $sleep_time seconds\n";
reboot;
start_monitor;
wait_for_monitor $sleep_time;
end_monitor;
reboot $sleep_time;
}
}
@ -1500,10 +1505,7 @@ sub run_git_bisect {
sub bisect_reboot {
doprint "Reboot and sleep $bisect_sleep_time seconds\n";
reboot;
start_monitor;
wait_for_monitor $bisect_sleep_time;
end_monitor;
reboot $bisect_sleep_time;
}
# returns 1 on success, 0 on failure, -1 on skip
@ -2066,10 +2068,7 @@ sub config_bisect {
sub patchcheck_reboot {
doprint "Reboot and sleep $patchcheck_sleep_time seconds\n";
reboot;
start_monitor;
wait_for_monitor $patchcheck_sleep_time;
end_monitor;
reboot $patchcheck_sleep_time;
}
sub patchcheck {
@ -2659,10 +2658,7 @@ sub make_min_config {
}
doprint "Reboot and wait $sleep_time seconds\n";
reboot;
start_monitor;
wait_for_monitor $sleep_time;
end_monitor;
reboot $sleep_time;
}
success $i;