Changeset 155479 in webkit

Timestamp:

Sep 10, 2013, 2:55:41 PM (12 years ago)

Author:

mark.lam@apple.com

Message:

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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• Scripts/run-javascriptcore-tests (modified) (9 diffs)
• Scripts/run-layout-jsc (moved) (moved from trunk/Tools/Scripts/run-fast-jsc )

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py

@@ -134 +134 @@
     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.
@@ -148 +148 @@
     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.
@@ -162 +162 @@
     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.

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/Scripts/run-javascriptcore-tests

@@ -73 +73 @@
 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.
@@ -87 +87 @@
 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;
@@ -98 +98 @@
   --[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
@@ -109 +109 @@
     'testapi!' => \$runTestAPI,
     'mozilla!' => \$runMozilla,
-    'fast-js!' => \$runFastJS,
+    'layout!' => \$runLayout,
     'jsc-stress!' => \$runJSCStress,
     'help' => \$showHelp
@@ -226 +226 @@
 
 chdirWebKit();
-my $fastJSResultsDir = $productDir . "/fast-jsc-results";
-
-if ($runFastJS) {
+my $layoutJSResultsDir = $productDir . "/layout-jsc-results";
+
+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;
 }
@@ -299 +299 @@
 }
 
-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";
     }
@@ -312 +312 @@
 if ($numJSCrashes) {
     print "\n** The following js test crashes have been introduced:\n";
-    foreach my $testCrash (@fastJSCrashList) {
+    foreach my $testCrash (@layoutJSCrashList) {
         print "\t$testCrash";
     }
@@ -338 +338 @@
 }
 
-if ($runFastJS) {
+if ($runLayout) {
     print "Results for js tests:\n";
     printThingsFound($numJSFailures, "failure", "failures", "found");
@@ -355 +355 @@
 }
 
-exit(1)  if ($runMozilla && $numNewMozillaFailures) || ($runFastJS && ($numJSFailures || $numJSCrashes)) || ($runJSCStress && $numJSCStressFailures);
+exit(1)  if ($runMozilla && $numNewMozillaFailures) || ($runLayout && ($numJSFailures || $numJSCrashes)) || ($runJSCStress && $numJSCStressFailures);