aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing')
-rwxr-xr-xtools/testing/ktest/ktest.pl12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index cef28e6632b9..b96d3819c42e 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -841,12 +841,20 @@ sub monitor {
841 841
842 if ($booted) { 842 if ($booted) {
843 $line = wait_for_input($monitor_fp, $booted_timeout); 843 $line = wait_for_input($monitor_fp, $booted_timeout);
844 if (!defined($line)) {
845 my $s = $booted_timeout == 1 ? "" : "s";
846 doprint "Successful boot found: break after $booted_timeout second$s\n";
847 last;
848 }
844 } else { 849 } else {
845 $line = wait_for_input($monitor_fp); 850 $line = wait_for_input($monitor_fp);
851 if (!defined($line)) {
852 my $s = $timeout == 1 ? "" : "s";
853 doprint "Timed out after $timeout second$s\n";
854 last;
855 }
846 } 856 }
847 857
848 last if (!defined($line));
849
850 doprint $line; 858 doprint $line;
851 print DMESG $line; 859 print DMESG $line;
852 860