Modified: trunk/Tools/ChangeLog (202282 => 202283)
--- trunk/Tools/ChangeLog 2016-06-21 18:15:48 UTC (rev 202282)
+++ trunk/Tools/ChangeLog 2016-06-21 18:26:53 UTC (rev 202283)
@@ -1,3 +1,14 @@
+2016-06-21 Aakash Jain <aakash_j...@apple.com>
+
+ run-_javascript_core-tests should have flag to skip mozilla tests
+ https://bugs.webkit.org/show_bug.cgi?id=158963
+ rdar://problem/25838924
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/run-_javascript_core-tests:
+ (runJSCStressTests): Added flag to skip mozilla tests.
+
2016-06-20 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r202136.
Modified: trunk/Tools/Scripts/run-_javascript_core-tests (202282 => 202283)
--- trunk/Tools/Scripts/run-_javascript_core-tests 2016-06-21 18:15:48 UTC (rev 202282)
+++ trunk/Tools/Scripts/run-_javascript_core-tests 2016-06-21 18:26:53 UTC (rev 202283)
@@ -59,6 +59,7 @@
my $runJSCStress = 1;
my $runJITStressTests = 1;
+my $runMozillaTests = 1;
my $runQuickMode = 0;
my $envVars = "";
my $gmallocPath = undef;
@@ -77,6 +78,7 @@
my $testapiDefault = $runTestAPI ? "will run" : "will not run";
my $jscStressDefault = $runJSCStress ? "will run" : " will not run";
my $jitStressTestsDefault = $runJITStressTests ? "will run" : " will not run";
+my $mozillaTestsDefault = $runMozillaTests ? "will run" : " will not run";
my $quickModeDefault = $runQuickMode ? "some" : "all";
my $failFastDefault = $failFast ? "fail fast" : "don't fail fast";
my $filter;
@@ -89,6 +91,7 @@
--[no-]testapi Run (or don't run) testapi (default: $testapiDefault)
--[no-]jsc-stress Run (or don't run) the JSC stress tests (default: $jscStressDefault)
--[no-]jit-stress-tests Run (or don't run) the JIT stress tests (default: $jitStressTestsDefault)
+ --[no-]mozilla-tests Run (or don't run) the Mozilla tests (default: $mozillaTestsDefault)
--[no-]quick Run some (or all) of the regular testing modes (default: $quickModeDefault)
If the runner only runs some it will run the default and no-cjit-validate modes.
Note, this will not change the behavior of tests that specify their own modes.
@@ -119,6 +122,7 @@
'testapi!' => \$runTestAPI,
'jsc-stress!' => \$runJSCStress,
'jit-stress-tests!' => \$runJITStressTests,
+ 'mozilla-tests!' => \$runMozillaTests,
'quick!' => \$runQuickMode,
'fail-fast!' => \$failFast,
'json-output=s' => \$jsonFileName,
@@ -240,7 +244,6 @@
"PerformanceTests/SunSpider/no-architecture-specific-optimizations.yaml",
"PerformanceTests/SunSpider/shadow-chicken.yaml",
"PerformanceTests/SunSpider/tests/v8-v6",
- "Source/_javascript_Core/tests/mozilla/mozilla-tests.yaml",
"Source/_javascript_Core/tests/stress",
"LayoutTests/js/regress/script-tests",
"PerformanceTests/SunSpider/profiler-test.yaml",
@@ -249,10 +252,11 @@
"Source/_javascript_Core/tests/controlFlowProfiler.yaml",
"Source/_javascript_Core/tests/es6.yaml",
"Source/_javascript_Core/tests/modules.yaml");
- } else {
- @testList = ("Source/_javascript_Core/tests/mozilla/mozilla-tests.yaml");
}
+ if ($runMozillaTests) {
+ push(@testList, "Source/_javascript_Core/tests/mozilla/mozilla-tests.yaml");
+ }
# Set LANG environment variable so the stress tests will work with newer ruby (<rdar://problem/15010705>)
$ENV{LANG}="en_US.UTF-8";