Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319800
b: refs/heads/master
c: 8a80c72
h: refs/heads/master
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Jul 19, 2012
1 parent 6e8bb33 commit ec14b9f
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 407b95b7a085b5c1622033edc2720bb05f973317
refs/heads/master: 8a80c72711a9b78af433013067848c0a5473a484
28 changes: 27 additions & 1 deletion trunk/tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,7 @@ sub reboot {
if (defined($time)) {
if (wait_for_monitor($time, $reboot_success_line)) {
# reboot got stuck?
doprint "Reboot did not finish. Forcing power cycle\n";
run_command "$power_cycle";
}
end_monitor;
Expand Down Expand Up @@ -1235,6 +1236,9 @@ sub wait_for_monitor {
my $line;
my $booted = 0;
my $start_time = time;
my $skip_call_trace = 0;
my $bug = 0;
my $bug_ignored = 0;
my $now;

doprint "** Wait for monitor to settle down **\n";
Expand All @@ -1251,6 +1255,28 @@ sub wait_for_monitor {
$booted = 1;
}

if ($full_line =~ /\[ backtrace testing \]/) {
$skip_call_trace = 1;
}

if ($full_line =~ /call trace:/i) {
if (!$bug && !$skip_call_trace) {
if ($ignore_errors) {
$bug_ignored = 1;
} else {
$bug = 1;
}
}
}

if ($full_line =~ /\[ end of backtrace testing \]/) {
$skip_call_trace = 0;
}

if ($full_line =~ /Kernel panic -/) {
$bug = 1;
}

if ($line =~ /\n/) {
$full_line = "";
}
Expand All @@ -1261,7 +1287,7 @@ sub wait_for_monitor {
}
}
print "** Monitor flushed **\n";
return 0;
return $bug;
}

sub save_logs {
Expand Down

0 comments on commit ec14b9f

Please sign in to comment.