Unreviewed, don't run fast/js tests in run-javascriptcore-tests on platforms that
authorfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Sep 2013 07:23:58 +0000 (07:23 +0000)
committerfpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Sep 2013 07:23:58 +0000 (07:23 +0000)
can't support it because if non-bourne shells. This fixes part #2 of the Linux
bot breakage.

* Scripts/run-javascriptcore-tests:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/run-javascriptcore-tests

index eb38f0f4f7263597dcdd333102c97434b4e0d9dd..b6341ada12fcd8cbec0cfb10b8d9e5741e928559 100644 (file)
@@ -1,3 +1,11 @@
+2013-09-05  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, don't run fast/js tests in run-javascriptcore-tests on platforms that
+        can't support it because if non-bourne shells. This fixes part #2 of the Linux
+        bot breakage.
+
+        * Scripts/run-javascriptcore-tests:
+
 2013-09-05  Filip Pizlo  <fpizlo@apple.com>
 
         Unreviewed, don't rely on File::Slurp. This fixes part #1 of Linux bot breakage.
index 610b6531d1f8deeed7212d3525e990af1bcd79bc..8d6e3a76437c2356f0b4d5913521bc120e96fbe9 100755 (executable)
@@ -189,13 +189,16 @@ while (<ACTUAL>) {
 }
 close ACTUAL;
 
-# Run the fast/js tests.
 chdirWebKit();
 my $fastJSResultsDir = $productDir . "/fast-jsc-results";
-my @fastJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-fast-jsc", "-j", jscPath($productDir), "-r", $fastJSResultsDir, "-t", "LayoutTests");
-print "Running: " . join(" ", @fastJSDriverCmd) . "\n";
-$result = system(@fastJSDriverCmd);
-exit exitStatus($result) if $result;
+my $runFastJS = isAppleMacWebKit();
+if ($runFastJS) {
+    # Run the fast/js tests.
+    my @fastJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-fast-jsc", "-j", jscPath($productDir), "-r", $fastJSResultsDir, "-t", "LayoutTests");
+    print "Running: " . join(" ", @fastJSDriverCmd) . "\n";
+    $result = system(@fastJSDriverCmd);
+    exit exitStatus($result) if $result;
+}
 
 my $numNewMozillaFailures = keys %newMozillaFailures;
 if ($numNewMozillaFailures) {
@@ -262,11 +265,13 @@ print "    OK.\n" if $numNewMozillaFailures == 0;
 
 print "\n";
 
-print "Results for fast/js tests:\n";
-printThingsFound($numJSFailures, "failure", "failures", "found");
-printThingsFound($numJSCrashes, "crash", "crashes", "found");
-print "    OK.\n" if $numJSFailures == 0 && $numJSCrashes == 0;
-
-print "\n";
-
+if ($runFastJS) {
+    print "Results for fast/js tests:\n";
+    printThingsFound($numJSFailures, "failure", "failures", "found");
+    printThingsFound($numJSCrashes, "crash", "crashes", "found");
+    print "    OK.\n" if $numJSFailures == 0 && $numJSCrashes == 0;
+    
+    print "\n";
+}
+    
 exit(1)  if $numNewMozillaFailures || $numJSFailures || $numJSCrashes;