Просмотр исходного кода

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>
Steven Rostedt 14 лет назад
Родитель
Сommit
cd4f1d536c
1 измененных файлов с 10 добавлено и 2 удалено
  1. 10 2
      tools/testing/ktest/ktest.pl

+ 10 - 2
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;