diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-06-13 10:26:27 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-06-13 10:26:27 -0400 |
| commit | cd4f1d536c2b2221d5a80399698d39717bf40077 (patch) | |
| tree | f059efc7723440d6b467baa1f0c11de159172343 /tools/testing | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
| download | linux-3.10-cd4f1d536c2b2221d5a80399698d39717bf40077.tar.gz linux-3.10-cd4f1d536c2b2221d5a80399698d39717bf40077.tar.bz2 linux-3.10-cd4f1d536c2b2221d5a80399698d39717bf40077.zip | |
ktest: Notify reason to break out of monitoring boot
Different timeouts can cause the ktest monitor to break out of the
loop. It becomes annoying that one does not know the reason why
it exited the monitor loop. Display the cause of the reason why
the loop was exited.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index cef28e6632b..b96d3819c42 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -841,12 +841,20 @@ sub monitor { if ($booted) { $line = wait_for_input($monitor_fp, $booted_timeout); + if (!defined($line)) { + my $s = $booted_timeout == 1 ? "" : "s"; + doprint "Successful boot found: break after $booted_timeout second$s\n"; + last; + } } else { $line = wait_for_input($monitor_fp); + if (!defined($line)) { + my $s = $timeout == 1 ? "" : "s"; + doprint "Timed out after $timeout second$s\n"; + last; + } } - last if (!defined($line)); - doprint $line; print DMESG $line; |