Modified: trunk/Tools/ChangeLog (155102 => 155103)
--- trunk/Tools/ChangeLog 2013-09-05 07:22:01 UTC (rev 155102)
+++ trunk/Tools/ChangeLog 2013-09-05 07:23:58 UTC (rev 155103)
@@ -1,5 +1,13 @@
2013-09-05 Filip Pizlo <[email protected]>
+ Unreviewed, don't run fast/js tests in run-_javascript_core-tests on platforms that
+ can't support it because if non-bourne shells. This fixes part #2 of the Linux
+ bot breakage.
+
+ * Scripts/run-_javascript_core-tests:
+
+2013-09-05 Filip Pizlo <[email protected]>
+
Unreviewed, don't rely on File::Slurp. This fixes part #1 of Linux bot breakage.
* Scripts/run-_javascript_core-tests:
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (155102 => 155103)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2013-09-05 07:22:01 UTC (rev 155102)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2013-09-05 07:23:58 UTC (rev 155103)
@@ -189,13 +189,16 @@
}
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 "\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;
