Changeset 155479 in webkit


Ignore:
Timestamp:
Sep 10, 2013 2:55:41 PM (11 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:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py

    r155467 r155479  
    134134    OK.""")
    135135
    136     def test_fast_js_failure_new_output(self):
     136    def test_layout_failure_new_output(self):
    137137        self.assertResults(FAILURE, ["jscore-test", '469 failing js tests '], 1,  """Results for Mozilla tests:
    138138    0 regressions found.
     
    148148    OK.""")
    149149
    150     def test_fast_js_crash_new_output(self):
     150    def test_layout_crash_new_output(self):
    151151        self.assertResults(FAILURE, ["jscore-test", '1 crashing js test '], 1,  """Results for Mozilla tests:
    152152    0 regressions found.
     
    162162    OK.""")
    163163
    164     def test_mozilla_and_fast_js_failure_new_output(self):
     164    def test_mozilla_and_layout_failure_new_output(self):
    165165        self.assertResults(FAILURE, ["jscore-test", '1 failing Mozilla test ', '469 failing js tests '], 1,  """Results for Mozilla tests:
    166166    1 regression found.
  • trunk/Tools/ChangeLog

    r155467 r155479  
     12013-09-10  Mark Lam  <mark.lam@apple.com>
     2
     3        Replace remaining "fast js" names in scripts.
     4        https://bugs.webkit.org/show_bug.cgi?id=120899.
     5
     6        Rubber stamped by Filip Pizlo.
     7
     8        * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
     9        (test_layout_failure_new_output):
     10        (test_layout_crash_new_output):
     11        (test_mozilla_and_layout_failure_new_output):
     12        * Scripts/run-fast-jsc: Removed.
     13        * Scripts/run-javascriptcore-tests:
     14        * Scripts/run-layout-jsc: Copied from Tools/Scripts/run-fast-jsc.
     15
    1162013-09-10  Zan Dobersek  <zdobersek@igalia.com>
    217
  • trunk/Tools/Scripts/run-javascriptcore-tests

    r155467 r155479  
    7373my $runMozilla = 1;
    7474
    75 # FIXME: run-fast-jsc tests doesn't work properly on Windows
     75# FIXME: run-layout-jsc tests doesn't work properly on Windows
    7676# https://bugs.webkit.org/show_bug.cgi?id=120765
    77 my $runFastJS = !isAppleWinWebKit();
     77my $runLayout = !isAppleWinWebKit();
    7878
    7979# FIXME: run-jsc-stress-tests should be ported to other platforms.
     
    8787my $testapiDefault = $runTestAPI ? "will run" : "will not run";
    8888my $mozillaDefault = $runMozilla ? "will run" : "will not run";
    89 my $fastJSDefault = $runFastJS ? "will run" : "will not run";
     89my $layoutJSDefault = $runLayout ? "will run" : "will not run";
    9090my $jscStressDefault = $runJSCStress ? "will run" : " will not run";
    9191my $usage = <<EOF;
     
    9898  --[no-]testapi                Run (or don't run) testapi (default: $testapiDefault)
    9999  --[no-]mozilla                Run (or don't run) the Mozilla tests (default: $mozillaDefault)
    100   --[no-]fast-js                Run (or don't run) the js tests (default: $fastJSDefault)
     100  --[no-]layout                 Run (or don't run) the LayoutTests js tests (default: $layoutJSDefault)
    101101  --[no-]jsc-stress             Run (or don't run) the JSC stress tests (default: $jscStressDefault)
    102102EOF
     
    109109    'testapi!' => \$runTestAPI,
    110110    'mozilla!' => \$runMozilla,
    111     'fast-js!' => \$runFastJS,
     111    'layout!' => \$runLayout,
    112112    'jsc-stress!' => \$runJSCStress,
    113113    'help' => \$showHelp
     
    226226
    227227chdirWebKit();
    228 my $fastJSResultsDir = $productDir . "/fast-jsc-results";
    229 
    230 if ($runFastJS) {
     228my $layoutJSResultsDir = $productDir . "/layout-jsc-results";
     229
     230if ($runLayout) {
    231231    # Run the js tests.
    232     my @fastJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-fast-jsc", "-j", jscPath($productDir), "-r", $fastJSResultsDir, "-t", "LayoutTests");
    233     print "Running: " . join(" ", @fastJSDriverCmd) . "\n";
    234     my $result = system(@fastJSDriverCmd);
     232    my @layoutJSDriverCmd = ("/bin/sh", "Tools/Scripts/run-layout-jsc", "-j", jscPath($productDir), "-r", $layoutJSResultsDir, "-t", "LayoutTests");
     233    print "Running: " . join(" ", @layoutJSDriverCmd) . "\n";
     234    my $result = system(@layoutJSDriverCmd);
    235235    exit exitStatus($result) if $result;
    236236}
     
    299299}
    300300
    301 my @fastJSFailList = readAllLines($fastJSResultsDir . "/failed");
    302 my @fastJSCrashList = readAllLines($fastJSResultsDir . "/crashed");
    303 my $numJSFailures = @fastJSFailList;
    304 my $numJSCrashes = @fastJSCrashList;
     301my @layoutJSFailList = readAllLines($layoutJSResultsDir . "/failed");
     302my @layoutJSCrashList = readAllLines($layoutJSResultsDir . "/crashed");
     303my $numJSFailures = @layoutJSFailList;
     304my $numJSCrashes = @layoutJSCrashList;
    305305
    306306if ($numJSFailures) {
    307307    print "\n** The following js test failures have been introduced:\n";
    308     foreach my $testFailure (@fastJSFailList) {
     308    foreach my $testFailure (@layoutJSFailList) {
    309309        print "\t$testFailure";
    310310    }
     
    312312if ($numJSCrashes) {
    313313    print "\n** The following js test crashes have been introduced:\n";
    314     foreach my $testCrash (@fastJSCrashList) {
     314    foreach my $testCrash (@layoutJSCrashList) {
    315315        print "\t$testCrash";
    316316    }
     
    338338}
    339339
    340 if ($runFastJS) {
     340if ($runLayout) {
    341341    print "Results for js tests:\n";
    342342    printThingsFound($numJSFailures, "failure", "failures", "found");
     
    355355}
    356356
    357 exit(1)  if ($runMozilla && $numNewMozillaFailures) || ($runFastJS && ($numJSFailures || $numJSCrashes)) || ($runJSCStress && $numJSCStressFailures);
     357exit(1)  if ($runMozilla && $numNewMozillaFailures) || ($runLayout && ($numJSFailures || $numJSCrashes)) || ($runJSCStress && $numJSCStressFailures);
Note: See TracChangeset for help on using the changeset viewer.