Clarify testing mode names in run-jsc-stress-tests
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jul 2016 18:08:38 +0000 (18:08 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jul 2016 18:08:38 +0000 (18:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160021

Reviewed by Mark Lam.

Default should mean really default, not default with disabled FTL, renamed
- runMozillaTestDefault to runMozillaTestNoFTL
- runMozillaTestDefaultFTL to runMozillaTestDefault
- runDefault to runNoFTL
- runDefaultFTL to runDefault
- runLayoutTestDefault to runLayoutTestNoFTL
- runLayoutTestDefaultFTL to runLayoutTestDefault
- runNoisyTestDefault to runNoisyTestNoFTL
- runNoisyTestDefaultFTL to runNoisyTestDefault

Source/JavaScriptCore:

* tests/mozilla/mozilla-tests.yaml:
* tests/stress/lift-tdz-bypass-catch.js:
* tests/stress/obscure-error-message-dont-crash.js:
* tests/stress/shadow-chicken-disabled.js:

Tools:

* Scripts/run-jsc-stress-tests:

LayoutTests:

* js/regress/script-tests/DataView-custom-properties.js:
* js/regress/script-tests/HashMap-put-get-iterate-keys.js:
* js/regress/script-tests/HashMap-put-get-iterate.js:
* js/regress/script-tests/HashMap-string-put-get-iterate.js:
* js/regress/script-tests/array-nonarray-polymorhpic-access.js:
* js/regress/script-tests/basic-set.js:
* js/regress/script-tests/bug-153431.js:
* js/regress/script-tests/destructuring-arguments.js:
* js/regress/script-tests/destructuring-swap.js:
* js/regress/script-tests/inline-arguments-local-escape.js:
* js/regress/script-tests/method-on-number.js:
* js/regress/script-tests/new-array-buffer-push.js:
* js/regress/script-tests/new-array-push.js:
* js/regress/script-tests/poly-stricteq.js:
* js/regress/script-tests/polymorphic-array-call.js:
* js/regress/script-tests/regexp-prototype-is-not-instance.js:
* js/regress/script-tests/regexp-prototype-search-observable-side-effects.js:
* js/regress/script-tests/regexp-prototype-search-observable-side-effects2.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects2.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects3-flags.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects3-global.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects3-ignoreCase.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects3-multiline.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects3-sticky.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects3-unicode.js:
* js/regress/script-tests/regexp-prototype-split-observable-side-effects4.js:
* js/regress/script-tests/regexp-prototype-test-observable-side-effects.js:
* js/regress/script-tests/regexp-prototype-test-observable-side-effects2.js:
* js/regress/script-tests/string-equality.js:
* js/regress/script-tests/string-prototype-search-observable-side-effects.js:
* js/regress/script-tests/string-prototype-search-observable-side-effects2.js:
* js/regress/script-tests/string-prototype-search-observable-side-effects3.js:
* js/regress/script-tests/string-prototype-search-observable-side-effects4.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects2.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects3-flags.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects3-global.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects3-ignoreCase.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects3-multiline.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects3-sticky.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects3-unicode.js:
* js/regress/script-tests/string-prototype-split-observable-side-effects4.js:
* js/regress/script-tests/string-repeat-arith.js:
* js/regress/script-tests/string-sub.js:
* js/slow-stress/script-tests/destructuring-arguments-length.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@203512 268f45cc-cd09-0410-ab3c-d52691b4dbfc

54 files changed:
LayoutTests/ChangeLog
LayoutTests/js/regress/script-tests/DataView-custom-properties.js
LayoutTests/js/regress/script-tests/HashMap-put-get-iterate-keys.js
LayoutTests/js/regress/script-tests/HashMap-put-get-iterate.js
LayoutTests/js/regress/script-tests/HashMap-string-put-get-iterate.js
LayoutTests/js/regress/script-tests/array-nonarray-polymorhpic-access.js
LayoutTests/js/regress/script-tests/basic-set.js
LayoutTests/js/regress/script-tests/bug-153431.js
LayoutTests/js/regress/script-tests/destructuring-arguments.js
LayoutTests/js/regress/script-tests/destructuring-swap.js
LayoutTests/js/regress/script-tests/inline-arguments-local-escape.js
LayoutTests/js/regress/script-tests/method-on-number.js
LayoutTests/js/regress/script-tests/new-array-buffer-push.js
LayoutTests/js/regress/script-tests/new-array-push.js
LayoutTests/js/regress/script-tests/poly-stricteq.js
LayoutTests/js/regress/script-tests/polymorphic-array-call.js
LayoutTests/js/regress/script-tests/regexp-prototype-is-not-instance.js
LayoutTests/js/regress/script-tests/regexp-prototype-search-observable-side-effects.js
LayoutTests/js/regress/script-tests/regexp-prototype-search-observable-side-effects2.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects2.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects3-flags.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects3-global.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects3-ignoreCase.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects3-multiline.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects3-sticky.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects3-unicode.js
LayoutTests/js/regress/script-tests/regexp-prototype-split-observable-side-effects4.js
LayoutTests/js/regress/script-tests/regexp-prototype-test-observable-side-effects.js
LayoutTests/js/regress/script-tests/regexp-prototype-test-observable-side-effects2.js
LayoutTests/js/regress/script-tests/string-equality.js
LayoutTests/js/regress/script-tests/string-prototype-search-observable-side-effects.js
LayoutTests/js/regress/script-tests/string-prototype-search-observable-side-effects2.js
LayoutTests/js/regress/script-tests/string-prototype-search-observable-side-effects3.js
LayoutTests/js/regress/script-tests/string-prototype-search-observable-side-effects4.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects2.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects3-flags.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects3-global.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects3-ignoreCase.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects3-multiline.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects3-sticky.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects3-unicode.js
LayoutTests/js/regress/script-tests/string-prototype-split-observable-side-effects4.js
LayoutTests/js/regress/script-tests/string-repeat-arith.js
LayoutTests/js/regress/script-tests/string-sub.js
LayoutTests/js/slow-stress/script-tests/destructuring-arguments-length.js
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/tests/mozilla/mozilla-tests.yaml
Source/JavaScriptCore/tests/stress/lift-tdz-bypass-catch.js
Source/JavaScriptCore/tests/stress/obscure-error-message-dont-crash.js
Source/JavaScriptCore/tests/stress/shadow-chicken-disabled.js
Tools/ChangeLog
Tools/Scripts/run-jsc-stress-tests

index f52420a..ccc8766 100644 (file)
@@ -1,3 +1,67 @@
+2016-07-21  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Clarify testing mode names in run-jsc-stress-tests
+        https://bugs.webkit.org/show_bug.cgi?id=160021
+
+        Reviewed by Mark Lam.
+
+        Default should mean really default, not default with disabled FTL, renamed
+        - runMozillaTestDefault to runMozillaTestNoFTL
+        - runMozillaTestDefaultFTL to runMozillaTestDefault
+        - runDefault to runNoFTL
+        - runDefaultFTL to runDefault
+        - runLayoutTestDefault to runLayoutTestNoFTL
+        - runLayoutTestDefaultFTL to runLayoutTestDefault
+        - runNoisyTestDefault to runNoisyTestNoFTL
+        - runNoisyTestDefaultFTL to runNoisyTestDefault
+
+        * js/regress/script-tests/DataView-custom-properties.js:
+        * js/regress/script-tests/HashMap-put-get-iterate-keys.js:
+        * js/regress/script-tests/HashMap-put-get-iterate.js:
+        * js/regress/script-tests/HashMap-string-put-get-iterate.js:
+        * js/regress/script-tests/array-nonarray-polymorhpic-access.js:
+        * js/regress/script-tests/basic-set.js:
+        * js/regress/script-tests/bug-153431.js:
+        * js/regress/script-tests/destructuring-arguments.js:
+        * js/regress/script-tests/destructuring-swap.js:
+        * js/regress/script-tests/inline-arguments-local-escape.js:
+        * js/regress/script-tests/method-on-number.js:
+        * js/regress/script-tests/new-array-buffer-push.js:
+        * js/regress/script-tests/new-array-push.js:
+        * js/regress/script-tests/poly-stricteq.js:
+        * js/regress/script-tests/polymorphic-array-call.js:
+        * js/regress/script-tests/regexp-prototype-is-not-instance.js:
+        * js/regress/script-tests/regexp-prototype-search-observable-side-effects.js:
+        * js/regress/script-tests/regexp-prototype-search-observable-side-effects2.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects2.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects3-flags.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects3-global.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects3-ignoreCase.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects3-multiline.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects3-sticky.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects3-unicode.js:
+        * js/regress/script-tests/regexp-prototype-split-observable-side-effects4.js:
+        * js/regress/script-tests/regexp-prototype-test-observable-side-effects.js:
+        * js/regress/script-tests/regexp-prototype-test-observable-side-effects2.js:
+        * js/regress/script-tests/string-equality.js:
+        * js/regress/script-tests/string-prototype-search-observable-side-effects.js:
+        * js/regress/script-tests/string-prototype-search-observable-side-effects2.js:
+        * js/regress/script-tests/string-prototype-search-observable-side-effects3.js:
+        * js/regress/script-tests/string-prototype-search-observable-side-effects4.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects2.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects3-flags.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects3-global.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects3-ignoreCase.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects3-multiline.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects3-sticky.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects3-unicode.js:
+        * js/regress/script-tests/string-prototype-split-observable-side-effects4.js:
+        * js/regress/script-tests/string-repeat-arith.js:
+        * js/regress/script-tests/string-sub.js:
+        * js/slow-stress/script-tests/destructuring-arguments-length.js:
+
 2016-07-21  Chris Dumez  <cdumez@apple.com>
 
         playsInline IDL attribute has the wrong casing
index 29dc183..f4d3021 100644 (file)
@@ -1,4 +1,4 @@
-//@ runDefault
+//@ runNoFTL
 
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
index 9d3826d..c45a6d7 100644 (file)
@@ -1,4 +1,4 @@
-//@ runDefault
+//@ runNoFTL
 
 var set = new Set;
 for (var i = 0; i < 8000; ++i) {
index 86a6ea4..607d8da 100644 (file)
@@ -1,4 +1,4 @@
-//@ runDefault
+//@ runNoFTL
 
 // Regression test for https://bugs.webkit.org/show_bug.cgi?id=153431.
 // Reduced version based on the reproduction case provided by Ryan Sturgell in the bug,
index 9245e10..6e23b9c 100644 (file)
@@ -1,4 +1,4 @@
-//@ runDefault
+//@ runNoFTL
 
 // Tests the performance of completely polymorphic strict equality.
 
index 518993a..2366505 100644 (file)
@@ -1,3 +1,25 @@
+2016-07-21  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Clarify testing mode names in run-jsc-stress-tests
+        https://bugs.webkit.org/show_bug.cgi?id=160021
+
+        Reviewed by Mark Lam.
+
+        Default should mean really default, not default with disabled FTL, renamed
+        - runMozillaTestDefault to runMozillaTestNoFTL
+        - runMozillaTestDefaultFTL to runMozillaTestDefault
+        - runDefault to runNoFTL
+        - runDefaultFTL to runDefault
+        - runLayoutTestDefault to runLayoutTestNoFTL
+        - runLayoutTestDefaultFTL to runLayoutTestDefault
+        - runNoisyTestDefault to runNoisyTestNoFTL
+        - runNoisyTestDefaultFTL to runNoisyTestDefault
+
+        * tests/mozilla/mozilla-tests.yaml:
+        * tests/stress/lift-tdz-bypass-catch.js:
+        * tests/stress/obscure-error-message-dont-crash.js:
+        * tests/stress/shadow-chicken-disabled.js:
+
 2016-07-20  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [ES7] Introduce exponentiation expression
index b301a35..d78aeb4 100644 (file)
 - path: ecma/FunctionObjects/15.3.1.1-2.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.1.1-3.js
-  cmd: runMozillaTestDefaultFTL :normal, "../shell.js"
+  cmd: runMozillaTestDefault :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.2.1-1.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.2.1-2.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.2.1-3.js
-  cmd: runMozillaTestDefaultFTL :normal, "../shell.js"
+  cmd: runMozillaTestDefault :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.3.1-1.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.3.1-2.js
 - path: ecma/FunctionObjects/15.3.4.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.5-1.js
-  cmd: runMozillaTestDefaultFTL :normal, "../shell.js"
+  cmd: runMozillaTestDefault :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.5-2.js
   cmd: defaultRunMozillaTest :normal, "../shell.js"
 - path: ecma/FunctionObjects/15.3.5.1.js
index 936b9aa..a731003 100644 (file)
@@ -1,4 +1,4 @@
-//@ runDefault; runNoLLInt; runFTLNoCJITValidate
+//@ runNoFTL; runNoLLInt; runFTLNoCJITValidate
 
 "use strict";
 
index fd3259a..cc7de18 100644 (file)
@@ -1,3 +1,22 @@
+2016-07-21  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Clarify testing mode names in run-jsc-stress-tests
+        https://bugs.webkit.org/show_bug.cgi?id=160021
+
+        Reviewed by Mark Lam.
+
+        Default should mean really default, not default with disabled FTL, renamed
+        - runMozillaTestDefault to runMozillaTestNoFTL
+        - runMozillaTestDefaultFTL to runMozillaTestDefault
+        - runDefault to runNoFTL
+        - runDefaultFTL to runDefault
+        - runLayoutTestDefault to runLayoutTestNoFTL
+        - runLayoutTestDefaultFTL to runLayoutTestDefault
+        - runNoisyTestDefault to runNoisyTestNoFTL
+        - runNoisyTestDefaultFTL to runNoisyTestDefault
+
+        * Scripts/run-jsc-stress-tests:
+
 2016-07-21  Yongjun Zhang  <yongjun_zhang@apple.com>
 
         WebBackForwardList's currentIndex could get out of bounds when filtering items.
index 6794ba1..01e1f04 100755 (executable)
@@ -767,8 +767,8 @@ def run(kind, *options)
     addRunCommand(kind, [pathToVM.to_s] + BASE_OPTIONS + options + [$benchmark.to_s], silentOutputHandler, simpleErrorHandler)
 end
 
-def runDefault
-    run("default")
+def runNoFTL
+    run("no-ftl")
 end
 
 def runWithRAMSize(size)
@@ -802,8 +802,8 @@ def runNoCJITValidatePhases
     run("no-cjit-validate-phases", "--validateBytecode=true", "--validateGraphAtEachPhase=true", *NO_CJIT_OPTIONS)
 end
 
-def runDefaultFTL
-    run("default-ftl", *FTL_OPTIONS)
+def runDefault
+    run("default", *FTL_OPTIONS)
 end
 
 def runFTLNoCJIT
@@ -886,14 +886,14 @@ def defaultRun
     if $quickMode
         defaultQuickRun
     else
-        runDefault
+        runNoFTL
         runAlwaysTriggerCopyPhase
         if $jitTests
             runNoLLInt
             runNoCJITValidatePhases
             runDFGEager
             runDFGEagerNoCJITValidate
-            runDefaultFTL
+            runDefault
             runFTLNoCJITValidate
             runFTLNoCJITNoPutStackValidate
             runFTLNoCJITNoInlineValidate
@@ -909,13 +909,13 @@ def defaultNoNoLLIntRun
     if $quickMode
         defaultQuickRun
     else
-        runDefault
+        runNoFTL
         runAlwaysTriggerCopyPhase
         if $jitTests
             runNoCJITValidatePhases
             runDFGEager
             runDFGEagerNoCJITValidate
-            runDefaultFTL
+            runDefault
             runFTLNoCJITValidate
             runFTLNoCJITNoPutStackValidate
             runFTLNoCJITNoInlineValidate
@@ -929,10 +929,10 @@ end
 
 def defaultQuickRun
     if $jitTests
-        runDefaultFTL
+        runDefault
         runFTLNoCJITValidate
     else
-        runDefault
+        runNoFTL
         if $jitTests
             runNoCJITValidate
         end
@@ -955,26 +955,26 @@ end
 # for reasons that don't arise in the real world. It's used for tests that assert convergence
 # by counting recompilations.
 def defaultNoEagerRun
-    runDefault
+    runNoFTL
     runAlwaysTriggerCopyPhase
     if $jitTests
         runNoLLInt
         runNoCJITValidatePhases
-        runDefaultFTL
+        runDefault
         runFTLNoCJITValidate
         runFTLNoCJITNoInlineValidate
     end
 end
 
 def defaultNoSamplingProfilerRun
-    runDefault
+    runNoFTL
     runAlwaysTriggerCopyPhase
     if $jitTests
         runNoLLInt
         runNoCJITValidatePhases
         runDFGEager
         runDFGEagerNoCJITValidate
-        runDefaultFTL
+        runDefault
         runFTLNoCJITNoPutStackValidate
         runFTLNoCJITNoInlineValidate
         runFTLEager
@@ -1136,8 +1136,8 @@ def runLayoutTest(kind, *options)
     addRunCommand(kind, args, noisyOutputHandler, diffErrorHandler(($benchmarkDirectory + "../#{testName}-expected.txt").to_s))
 end
 
-def runLayoutTestDefault
-    runLayoutTest(nil)
+def runLayoutTestNoFTL
+    runLayoutTest("no-ftl")
 end
 
 def runLayoutTestNoLLInt
@@ -1152,8 +1152,8 @@ def runLayoutTestDFGEagerNoCJIT
     runLayoutTest("dfg-eager-no-cjit", *(NO_CJIT_OPTIONS + EAGER_OPTIONS))
 end
 
-def runLayoutTestDefaultFTL
-    runLayoutTest("ftl", "--testTheFTL=true", *FTL_OPTIONS)
+def runLayoutTestDefault
+    runLayoutTest(nil, "--testTheFTL=true", *FTL_OPTIONS)
 end
 
 def runLayoutTestFTLNoCJIT
@@ -1175,7 +1175,7 @@ def noFTLRunLayoutTest
 end
 
 def defaultQuickRunLayoutTest
-    runLayoutTestDefault
+    runLayoutTestNoFTL
     if $jitTests
         runLayoutTestFTLNoCJIT
         runLayoutTestFTLEagerNoCJIT
@@ -1186,10 +1186,10 @@ def defaultRunLayoutTest
     if $quickMode
         defaultQuickRunLayoutTest
     else
-        runLayoutTestDefault
+        runLayoutTestNoFTL
         if $jitTests
             noFTLRunLayoutTest
-            runLayoutTestDefaultFTL
+            runLayoutTestDefault
             runLayoutTestFTLNoCJIT
             runLayoutTestFTLEagerNoCJIT
         end
@@ -1197,20 +1197,20 @@ def defaultRunLayoutTest
 end
 
 def noEagerNoNoLLIntTestsRunLayoutTest
-    runLayoutTestDefault
+    runLayoutTestNoFTL
     if $jitTests
         runLayoutTestNoCJIT
-        runLayoutTestDefaultFTL
+        runLayoutTestDefault
         runLayoutTestFTLNoCJIT
     end
 end
 
 def noNoLLIntRunLayoutTest
-    runLayoutTestDefault
+    runLayoutTestNoFTL
     if $jitTests
         runLayoutTestNoCJIT
         runLayoutTestDFGEagerNoCJIT
-        runLayoutTestDefaultFTL
+        runLayoutTestDefault
         runLayoutTestFTLNoCJIT
         runLayoutTestFTLEagerNoCJIT
     end
@@ -1268,11 +1268,11 @@ def runMozillaTest(kind, mode, extraFiles, *options)
 end
 
 def runMozillaTestDefault(mode, *extraFiles)
-    runMozillaTest(nil, mode, extraFiles)
+    runMozillaTest(nil, mode, extraFiles, *FTL_OPTIONS)
 end
 
-def runMozillaTestDefaultFTL(mode, *extraFiles)
-    runMozillaTest("ftl", mode, extraFiles, *FTL_OPTIONS)
+def runMozillaTestNoFTL(mode, *extraFiles)
+    runMozillaTest("no-ftl", mode, extraFiles)
 end
 
 def runMozillaTestLLInt(mode, *extraFiles)
@@ -1293,10 +1293,10 @@ end
 
 def defaultQuickRunMozillaTest(mode, *extraFiles)
     if $jitTests
-        runMozillaTestDefaultFTL(mode, *extraFiles)
+        runMozillaTestDefault(mode, *extraFiles)
         runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
     else
-        runMozillaTestDefault(mode, *extraFiles)
+        runMozillaTestNoFTL(mode, *extraFiles)
         if $jitTests
             runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
         end
@@ -1307,12 +1307,12 @@ def defaultRunMozillaTest(mode, *extraFiles)
     if $quickMode
         defaultQuickRunMozillaTest(mode, *extraFiles)
     else
-        runMozillaTestDefault(mode, *extraFiles)
+        runMozillaTestNoFTL(mode, *extraFiles)
         if $jitTests
             runMozillaTestLLInt(mode, *extraFiles)
             runMozillaTestBaselineJIT(mode, *extraFiles)
             runMozillaTestDFGEagerNoCJITValidatePhases(mode, *extraFiles)
-            runMozillaTestDefaultFTL(mode, *extraFiles)
+            runMozillaTestDefault(mode, *extraFiles)
             runMozillaTestFTLEagerNoCJITValidatePhases(mode, *extraFiles)
         end
     end
@@ -1323,11 +1323,11 @@ def runNoisyTest(kind, *options)
 end
 
 def runNoisyTestDefault
-    runNoisyTest("default")
+    runNoisyTest("default", *FTL_OPTIONS)
 end
 
-def runNoisyTestDefaultFTL
-    runNoisyTest("ftl", *FTL_OPTIONS)
+def runNoisyTestNoFTL
+    runNoisyTest("no-ftl")
 end
 
 def runNoisyTestNoCJIT
@@ -1339,9 +1339,9 @@ def runNoisyTestEagerNoCJIT
 end
 
 def defaultRunNoisyTest
-    runNoisyTestDefault
+    runNoisyTestNoFTL
     if $jitTests
-        runNoisyTestDefaultFTL
+        runNoisyTestDefault
         runNoisyTestNoCJIT
         runNoisyTestEagerNoCJIT
     end