Skip to content
Permalink
Browse files
Replace remaining "fast js" names in scripts.
https://bugs.webkit.org/show_bug.cgi?id=120899.

Rubber stamped by Filip Pizlo.

* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(test_layout_failure_new_output):
(test_layout_crash_new_output):
(test_mozilla_and_layout_failure_new_output):
* Scripts/run-fast-jsc: Removed.
* Scripts/run-javascriptcore-tests:
* Scripts/run-layout-jsc: Copied from Tools/Scripts/run-fast-jsc.



Canonical link: https://commits.webkit.org/139042@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Mark Lam committed Sep 10, 2013
1 parent 11b981d commit 469864893e028a1651d256aaf2bda71188cd18f5
Showing 4 changed files with 36 additions and 21 deletions.
@@ -133,7 +133,7 @@ def test_mozilla_failure_new_output(self):
0 crashes found.
OK.""")

def test_fast_js_failure_new_output(self):
def test_layout_failure_new_output(self):
self.assertResults(FAILURE, ["jscore-test", '469 failing js tests '], 1, """Results for Mozilla tests:
0 regressions found.
0 tests fixed.
@@ -147,7 +147,7 @@ def test_fast_js_failure_new_output(self):
0 failures found.
OK.""")

def test_fast_js_crash_new_output(self):
def test_layout_crash_new_output(self):
self.assertResults(FAILURE, ["jscore-test", '1 crashing js test '], 1, """Results for Mozilla tests:
0 regressions found.
0 tests fixed.
@@ -161,7 +161,7 @@ def test_fast_js_crash_new_output(self):
0 failures found.
OK.""")

def test_mozilla_and_fast_js_failure_new_output(self):
def test_mozilla_and_layout_failure_new_output(self):
self.assertResults(FAILURE, ["jscore-test", '1 failing Mozilla test ', '469 failing js tests '], 1, """Results for Mozilla tests:
1 regression found.
0 tests fixed.
@@ -1,3 +1,18 @@
2013-09-10 Mark Lam <mark.lam@apple.com>

Replace remaining "fast js" names in scripts.
https://bugs.webkit.org/show_bug.cgi?id=120899.

Rubber stamped by Filip Pizlo.

* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(test_layout_failure_new_output):
(test_layout_crash_new_output):
(test_mozilla_and_layout_failure_new_output):
* Scripts/run-fast-jsc: Removed.
* Scripts/run-javascriptcore-tests:
* Scripts/run-layout-jsc: Copied from Tools/Scripts/run-fast-jsc.

2013-09-10 Zan Dobersek <zdobersek@igalia.com>

Enable JSC stress tests for the rest of non-Windows platforms
@@ -72,9 +72,9 @@ my $runTestAPI = isAppleMacWebKit() || isAppleWinWebKit();

my $runMozilla = 1;

# FIXME: run-fast-jsc tests doesn't work properly on Windows
# FIXME: run-layout-jsc tests doesn't work properly on Windows
# https://bugs.webkit.org/show_bug.cgi?id=120765
my $runFastJS = !isAppleWinWebKit();
my $runLayout = !isAppleWinWebKit();

# FIXME: run-jsc-stress-tests should be ported to other platforms.
# https://bugs.webkit.org/show_bug.cgi?id=120809
@@ -86,7 +86,7 @@ my $programName = basename($0);
my $buildJSCDefault = $buildJSC ? "will check" : "will not check";
my $testapiDefault = $runTestAPI ? "will run" : "will not run";
my $mozillaDefault = $runMozilla ? "will run" : "will not run";
my $fastJSDefault = $runFastJS ? "will run" : "will not run";
my $layoutJSDefault = $runLayout ? "will run" : "will not run";
my $jscStressDefault = $runJSCStress ? "will run" : " will not run";
my $usage = <<EOF;
Usage: $programName [options] [options to pass to build system]
@@ -97,7 +97,7 @@ Usage: $programName [options] [options to pass to build system]
--[no-]build Check (or don't check) to see if the jsc build is up-to-date (default: $buildJSCDefault)
--[no-]testapi Run (or don't run) testapi (default: $testapiDefault)
--[no-]mozilla Run (or don't run) the Mozilla tests (default: $mozillaDefault)
--[no-]fast-js Run (or don't run) the js tests (default: $fastJSDefault)
--[no-]layout Run (or don't run) the LayoutTests js tests (default: $layoutJSDefault)
--[no-]jsc-stress Run (or don't run) the JSC stress tests (default: $jscStressDefault)
EOF

@@ -108,7 +108,7 @@ GetOptions(
'ftl-jit!' => \$enableFTL,
'testapi!' => \$runTestAPI,
'mozilla!' => \$runMozilla,
'fast-js!' => \$runFastJS,
'layout!' => \$runLayout,
'jsc-stress!' => \$runJSCStress,
'help' => \$showHelp
);
@@ -225,13 +225,13 @@ if ($runMozilla) {
}

chdirWebKit();
my $fastJSResultsDir = $productDir . "/fast-jsc-results";
my $layoutJSResultsDir = $productDir . "/layout-jsc-results";

if ($runFastJS) {
if ($runLayout) {
# Run the js tests.
my @fastJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-fast-jsc", "-j", jscPath($productDir), "-r", $fastJSResultsDir, "-t", "LayoutTests");
print "Running: " . join(" ", @fastJSDriverCmd) . "\n";
my $result = system(@fastJSDriverCmd);
my @layoutJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-layout-jsc", "-j", jscPath($productDir), "-r", $layoutJSResultsDir, "-t", "LayoutTests");
print "Running: " . join(" ", @layoutJSDriverCmd) . "\n";
my $result = system(@layoutJSDriverCmd);
exit exitStatus($result) if $result;
}

@@ -298,20 +298,20 @@ sub printThingsFound
print " $verb.\n";
}

my @fastJSFailList = readAllLines($fastJSResultsDir . "/failed");
my @fastJSCrashList = readAllLines($fastJSResultsDir . "/crashed");
my $numJSFailures = @fastJSFailList;
my $numJSCrashes = @fastJSCrashList;
my @layoutJSFailList = readAllLines($layoutJSResultsDir . "/failed");
my @layoutJSCrashList = readAllLines($layoutJSResultsDir . "/crashed");
my $numJSFailures = @layoutJSFailList;
my $numJSCrashes = @layoutJSCrashList;

if ($numJSFailures) {
print "\n** The following js test failures have been introduced:\n";
foreach my $testFailure (@fastJSFailList) {
foreach my $testFailure (@layoutJSFailList) {
print "\t$testFailure";
}
}
if ($numJSCrashes) {
print "\n** The following js test crashes have been introduced:\n";
foreach my $testCrash (@fastJSCrashList) {
foreach my $testCrash (@layoutJSCrashList) {
print "\t$testCrash";
}
}
@@ -337,7 +337,7 @@ if ($runMozilla) {
print "\n";
}

if ($runFastJS) {
if ($runLayout) {
print "Results for js tests:\n";
printThingsFound($numJSFailures, "failure", "failures", "found");
printThingsFound($numJSCrashes, "crash", "crashes", "found");
@@ -354,4 +354,4 @@ if ($runJSCStress) {
print "\n";
}

exit(1) if ($runMozilla && $numNewMozillaFailures) || ($runFastJS && ($numJSFailures || $numJSCrashes)) || ($runJSCStress && $numJSCStressFailures);
exit(1) if ($runMozilla && $numNewMozillaFailures) || ($runLayout && ($numJSFailures || $numJSCrashes)) || ($runJSCStress && $numJSCStressFailures);
File renamed without changes.

0 comments on commit 4698648

Please sign in to comment.