Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

1 files changed, 14 insertions, 5 deletions

diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 2cef18b..eeaaab3 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -917,8 +917,7 @@ for my $test (@tests) {
         testCrashedOrTimedOut($test, $base, 1, $actual, $error);
     } elsif (!defined $expected) {
         if ($verbose) {
-            print "new " . ($resetResults ? "result" : "test") ."\n";
-            $atLineStart = 1;
+            print "new " . ($resetResults ? "result" : "test");
         }
         $result = "new";
 
@@ -936,11 +935,13 @@ for my $test (@tests) {
                 print "$test -> ";
             }
             my $resultsDir = catdir($expectedDir, dirname($base));
+            if (!$verbose) {
+                print "new";
+            }
             if ($generateNewResults) {
-                print "new (results generated in $resultsDir)\n";
-            } else {
-                print "new\n";
+                print " (results generated in $resultsDir)";
             }
+            print "\n" unless $atLineStart;
             $atLineStart = 1;
         }
     } elsif ($actual eq $expected && $diffResult eq "passed") {
@@ -1420,6 +1421,10 @@ sub openDumpTool()
 {
     return if $isDumpToolOpen;
 
+    if ($verbose && $testsPerDumpTool != 1) {
+        print "| Opening DumpTool |\n";
+    }
+
     my %CLEAN_ENV;
 
     # Generic environment variables
@@ -1502,6 +1507,10 @@ sub closeDumpTool()
 {
     return if !$isDumpToolOpen;
 
+    if ($verbose && $testsPerDumpTool != 1) {
+        print "| Closing DumpTool |\n";
+    }
+
     close IN;
     close OUT;
     waitpid $dumpToolPID, 0;