Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247940
b: refs/heads/master
c: 27d934b
h: refs/heads/master
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed May 20, 2011
1 parent 81272fe commit 101d34a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4025bc62dd045d326d8a26a50fc86fd163aec89f
refs/heads/master: 27d934b28752b860cba6c0d77ea4598861d80998
13 changes: 13 additions & 0 deletions trunk/tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
$default{"POWEROFF_ON_SUCCESS"} = 0;
$default{"BUILD_OPTIONS"} = "";
$default{"BISECT_SLEEP_TIME"} = 60; # sleep time between bisects
$default{"PATCHCHECK_SLEEP_TIME"} = 60; # sleep time between patch checks
$default{"CLEAR_LOG"} = 0;
$default{"BISECT_MANUAL"} = 0;
$default{"BISECT_SKIP"} = 1;
Expand Down Expand Up @@ -96,6 +97,7 @@
my $monitor_cnt = 0;
my $sleep_time;
my $bisect_sleep_time;
my $patchcheck_sleep_time;
my $store_failures;
my $timeout;
my $booted_timeout;
Expand Down Expand Up @@ -1764,6 +1766,14 @@ sub config_bisect {
success $i;
}

sub patchcheck_reboot {
doprint "Reboot and sleep $patchcheck_sleep_time seconds\n";
reboot;
start_monitor;
wait_for_monitor $patchcheck_sleep_time;
end_monitor;
}

sub patchcheck {
my ($i) = @_;

Expand Down Expand Up @@ -1855,6 +1865,8 @@ sub patchcheck {
end_monitor;
return 0 if ($failed);

patchcheck_reboot;

}
$in_patchcheck = 0;
success $i;
Expand Down Expand Up @@ -2004,6 +2016,7 @@ sub set_test_option {
$poweroff_after_halt = set_test_option("POWEROFF_AFTER_HALT", $i);
$sleep_time = set_test_option("SLEEP_TIME", $i);
$bisect_sleep_time = set_test_option("BISECT_SLEEP_TIME", $i);
$patchcheck_sleep_time = set_test_option("PATCHCHECK_SLEEP_TIME", $i);
$bisect_manual = set_test_option("BISECT_MANUAL", $i);
$bisect_skip = set_test_option("BISECT_SKIP", $i);
$store_failures = set_test_option("STORE_FAILURES", $i);
Expand Down
4 changes: 4 additions & 0 deletions trunk/tools/testing/ktest/sample.conf
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,10 @@
# (default 60)
#BISECT_SLEEP_TIME = 60

# The time in between patch checks to sleep (in seconds)
# (default 60)
#PATCHCHECK_SLEEP_TIME = 60

# Reboot the target box on error (default 0)
#REBOOT_ON_ERROR = 0

Expand Down

0 comments on commit 101d34a

Please sign in to comment.