Skip to content

Commit

Permalink
Unreviewed, don't run fast/js tests in run-javascriptcore-tests on pl…
Browse files Browse the repository at this point in the history
…atforms that

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: http://svn.webkit.org/repository/webkit/trunk@155103 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
[email protected] committed Sep 5, 2013
1 parent 7810564 commit 96a266c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 12 deletions.
8 changes: 8 additions & 0 deletions Tools/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2013-09-05 Filip Pizlo <[email protected]>

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 <[email protected]>

Unreviewed, don't rely on File::Slurp. This fixes part #1 of Linux bot breakage.
Expand Down
29 changes: 17 additions & 12 deletions Tools/Scripts/run-javascriptcore-tests
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

0 comments on commit 96a266c

Please sign in to comment.