Merge https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs

[karo-tx-linux.git] / tools / testing / ktest / ktest.pl

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index ef1d99f3859cf01d15ec89b36b2977f68cbac4e3..d08e214ec6e793f07b71fb734c33db00baab901f 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1407,6 +1407,11 @@ sub dodie {
        print " See $opt{LOG_FILE} for more info.\n";
     }
 
+    if ($monitor_cnt) {
+           # restore terminal settings
+           system("stty $stty_orig");
+    }
+
     die @_, "\n";
 }
 
@@ -1449,7 +1454,7 @@ sub exec_console {
     close($pts);
 
     exec $console or
-       dodie "Can't open console $console";
+       die "Can't open console $console";
 }
 
 sub open_console {
@@ -1643,6 +1648,8 @@ sub fail {
            $name = " ($test_name)";
        }
 
+       print_times;
+
        doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
        doprint "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
        doprint "KTEST RESULT: TEST $i$name Failed: ", @_, "\n";
@@ -2494,6 +2501,8 @@ sub success {
        $name = " ($test_name)";
     }
 
+    print_times;
+
     doprint "\n\n*******************************************\n";
     doprint     "*******************************************\n";
     doprint     "KTEST RESULT: TEST $i$name SUCCESS!!!!         **\n";
@@ -3438,7 +3447,7 @@ sub patchcheck {
        my $sha1 = $item;
        $sha1 =~ s/^([[:xdigit:]]+).*/$1/;
 
-       doprint "\nProcessing commit $item\n\n";
+       doprint "\nProcessing commit \"$item\"\n\n";
 
        run_command "git checkout $sha1" or
            die "Failed to checkout $sha1";