Bug 1523876: Replace uses of test-also-wasm-compiler by test-also in wasm tests; r=lth
authorBenjamin Bouvier <benj@benj.me>
Wed, 30 Jan 2019 14:18:15 +0100
changeset 514119 8bd53bf9a6913eb2f6cfdc475f2f9cf3e60cbd9b
parent 514088 1705824aa93ebc304196ad6456dbb177f4594cdd
child 514120 39ba22f56d90e00f31b4f0f367c239f86f40965e
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslth
bugs1523876
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1523876: Replace uses of test-also-wasm-compiler by test-also in wasm tests; r=lth
js/src/jit-test/jit_test.py
js/src/jit-test/tests/asm.js/directives.txt
js/src/jit-test/tests/debug/bug1330339.js
js/src/jit-test/tests/debug/bug1330489-sps.js
js/src/jit-test/tests/debug/bug1330489.js
js/src/jit-test/tests/debug/bug1330491.js
js/src/jit-test/tests/debug/bug1331064.js
js/src/jit-test/tests/debug/bug1331592.js
js/src/jit-test/tests/debug/bug1332493.js
js/src/jit-test/tests/debug/bug1343579.js
js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js
js/src/jit-test/tests/debug/wasm-06-onPop-null.js
js/src/jit-test/tests/debug/wasm-06.js
js/src/jit-test/tests/debug/wasm-07.js
js/src/jit-test/tests/debug/wasm-08.js
js/src/jit-test/tests/debug/wasm-09.js
js/src/jit-test/tests/debug/wasm-10.js
js/src/jit-test/tests/debug/wasm-11.js
js/src/jit-test/tests/debug/wasm-12.js
js/src/jit-test/tests/debug/wasm-breakpoint.js
js/src/jit-test/tests/debug/wasm-get-return.js
js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
js/src/jit-test/tests/debug/wasm-responseurls.js
js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
js/src/jit-test/tests/debug/wasm-step.js
js/src/jit-test/tests/wasm/bench/directives.txt
js/src/jit-test/tests/wasm/directives.txt
js/src/jit-test/tests/wasm/regress/directives.txt
js/src/jit-test/tests/wasm/spec/directives.txt
js/src/jit-test/tests/wasm/timeout/directives.txt
js/src/tests/lib/jittests.py
js/src/wasm/Makefile
--- a/js/src/jit-test/jit_test.py
+++ b/js/src/jit-test/jit_test.py
@@ -210,30 +210,16 @@ def main(argv):
 
     if options.retest:
         options.read_tests = options.retest
         options.write_failures = options.retest
 
     test_list = []
     read_all = True
 
-    # No point in adding in noasmjs and wasm-baseline variants if the
-    # jitflags forbid asmjs in the first place. (This is to avoid getting a
-    # wasm-baseline run when requesting --jitflags=interp, but the test
-    # contains test-also-noasmjs.)
-    test_flags = get_jitflags(options.jitflags)
-    options.asmjs_enabled = True
-    options.wasm_enabled = True
-    if all(['--no-asmjs' in flags for flags in test_flags]):
-        options.asmjs_enabled = False
-        options.wasm_enabled = False
-    if all(['--wasm-compiler=none' in flags for flags in test_flags]):
-        options.asmjs_enabled = False
-        options.wasm_enabled = False
-
     if options.run_binast:
         code = 'print(getBuildConfiguration().binast)'
         is_binast_enabled = subprocess.check_output([js_shell, '-e', code])
         if not is_binast_enabled.startswith('true'):
             print("While --run-binast is specified, BinAST is not enabled.",
                   file=sys.stderr)
             print("BinAST testcases will be skipped.",
                   file=sys.stderr)
@@ -324,16 +310,18 @@ def main(argv):
         test_list = test_list[start:end]
 
     if not test_list:
         print("No tests found matching command line arguments after filtering.",
               file=sys.stderr)
         sys.exit(0)
 
     # The full test list is ready. Now create copies for each JIT configuration.
+    test_flags = get_jitflags(options.jitflags)
+
     test_list = [_ for test in test_list for _ in test.copy_variants(test_flags)]
 
     job_list = (test for test in test_list)
     job_count = len(test_list)
 
     if options.repeat:
         job_list = (test for test in job_list for i in range(options.repeat))
         job_count *= options.repeat
--- a/js/src/jit-test/tests/asm.js/directives.txt
+++ b/js/src/jit-test/tests/asm.js/directives.txt
@@ -1,1 +1,1 @@
-|jit-test| test-also-noasmjs
+|jit-test| test-also=--no-asmjs
--- a/js/src/jit-test/tests/debug/bug1330339.js
+++ b/js/src/jit-test/tests/debug/bug1330339.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
+// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
 
 if (!wasmDebuggingIsSupported())
      throw "TestComplete";
 
 let module = new WebAssembly.Module(wasmTextToBinary(`
     (module
         (import "global" "func")
         (func (export "test")
--- a/js/src/jit-test/tests/debug/bug1330489-sps.js
+++ b/js/src/jit-test/tests/debug/bug1330489-sps.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
+// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
 
 load(libdir + "asserts.js");
 
 if (!wasmDebuggingIsSupported())
     throw "TestComplete";
 
 // Single-step profiling currently only works in the ARM simulator
 if (!getBuildConfiguration()["arm-simulator"])
--- a/js/src/jit-test/tests/debug/bug1330489.js
+++ b/js/src/jit-test/tests/debug/bug1330489.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
+// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
 
 load(libdir + "asserts.js");
 
 if (!wasmDebuggingIsSupported())
     throw "TestComplete";
 
 var g = newGlobal({newCompartment: true});
 g.parent = this;
--- a/js/src/jit-test/tests/debug/bug1330491.js
+++ b/js/src/jit-test/tests/debug/bug1330491.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
+// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
 
 if (!wasmDebuggingIsSupported())
      throw "TestComplete";
 
 (function createShortLivedDebugger() {
     var g = newGlobal({newCompartment: true});
     g.debuggeeGlobal = this;
     g.eval("(" + function () {
--- a/js/src/jit-test/tests/debug/bug1331064.js
+++ b/js/src/jit-test/tests/debug/bug1331064.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
 
 load(libdir + "asserts.js");
 
 var g = newGlobal();
 g.parent = this;
 g.eval("new Debugger(parent).onExceptionUnwind = function () {  some_error; };");
 
 var module = new WebAssembly.Module(wasmTextToBinary(`
--- a/js/src/jit-test/tests/debug/bug1331592.js
+++ b/js/src/jit-test/tests/debug/bug1331592.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; error: TestComplete
+// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete
 
 if (!wasmDebuggingIsSupported())
      throw "TestComplete";
 
 var module = new WebAssembly.Module(wasmTextToBinary(`
     (module
         (import "global" "func" (result i32))
         (func (export "func_0") (result i32)
--- a/js/src/jit-test/tests/debug/bug1332493.js
+++ b/js/src/jit-test/tests/debug/bug1332493.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
 // Checking in debug frame is initialized properly during stack overflow.
 
 var dbg;
 (function () { dbg = new (newGlobal().Debugger)(this); })();
 
 var m = new WebAssembly.Module(wasmTextToBinary(`(module
     (import "a" "b" (result f64))
     ;; function that allocated large space for locals on the stack
--- a/js/src/jit-test/tests/debug/bug1343579.js
+++ b/js/src/jit-test/tests/debug/bug1343579.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Checking if Debugger.Script.isInCatchScope return false for wasm.
 
 load(libdir + "wasm.js");
 
 var results;
 wasmRunWithDebugger(
     '(module (memory 1) ' +
     '(func $func0 i32.const 1000000 i32.load drop) ' +
--- a/js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js
+++ b/js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
 // Checking resumption values for 'null' at onEnterFrame.
 
 load(libdir + "asserts.js");
 
 var g = newGlobal('');
 var dbg = new Debugger();
 dbg.addDebuggee(g);
 sandbox.eval(`
--- a/js/src/jit-test/tests/debug/wasm-06-onPop-null.js
+++ b/js/src/jit-test/tests/debug/wasm-06-onPop-null.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; exitstatus: 3; skip-if: !wasmDebuggingIsSupported()
 // Checking resumption values for 'null' at frame's onPop.
 
 load(libdir + "asserts.js");
 
 var g = newGlobal('');
 var dbg = new Debugger();
 dbg.addDebuggee(g);
 sandbox.eval(`
--- a/js/src/jit-test/tests/debug/wasm-06.js
+++ b/js/src/jit-test/tests/debug/wasm-06.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; error: TestComplete; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; error: TestComplete; skip-if: !wasmDebuggingIsSupported()
 // Tests that wasm module scripts raises onEnterFrame and onLeaveFrame events.
 
 load(libdir + "asserts.js");
 
 function runWasmWithDebugger(wast, lib, init, done) {
     let g = newGlobal({newCompartment: true});
     let dbg = new Debugger(g);
 
--- a/js/src/jit-test/tests/debug/wasm-07.js
+++ b/js/src/jit-test/tests/debug/wasm-07.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 
 // Checking existence of all frame.offset references during onEnterFrame,
 // onLeaveFrame and onStep events in the source code, and that we can
 // potentially resolve offset back to the line/column.
 
 load(libdir + "wasm.js");
 
 var offsets;
--- a/js/src/jit-test/tests/debug/wasm-08.js
+++ b/js/src/jit-test/tests/debug/wasm-08.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Checking if we destroying work registers by breakpoint/step handler.
 
 load(libdir + "wasm.js");
 
 // Running the following code compiled from C snippet:
 //
 //     signed func0(signed n) {
 //         double a = 1; float b = 0; signed c = 1; long long d = 1;
--- a/js/src/jit-test/tests/debug/wasm-09.js
+++ b/js/src/jit-test/tests/debug/wasm-09.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Tests debugEnabled state of wasm when allowUnobservedAsmJS == true.
 
 load(libdir + "asserts.js");
 
 // Checking that there are no offsets are present in a wasm instance script for
 // which debug mode was not enabled.
 function getWasmScriptWithoutAllowUnobservedAsmJS(wast) {
     var sandbox = newGlobal({newCompartment: true});
--- a/js/src/jit-test/tests/debug/wasm-10.js
+++ b/js/src/jit-test/tests/debug/wasm-10.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Tests that wasm module scripts has inspectable locals.
 
 load(libdir + "wasm.js");
 load(libdir + 'eqArrayHelper.js');
 
 function monitorLocalValues(wast, lib, expected) {
     function setupFrame(frame) {
         var locals = {};
--- a/js/src/jit-test/tests/debug/wasm-11.js
+++ b/js/src/jit-test/tests/debug/wasm-11.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 
 // Test single-stepping where the TLS register can be evicted by a non-trivial
 // function body.
 
 var g = newGlobal({newCompartment: true});
 g.parent = this;
 g.eval(`
     var dbg = new Debugger(parent);
--- a/js/src/jit-test/tests/debug/wasm-12.js
+++ b/js/src/jit-test/tests/debug/wasm-12.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 
 // Tests that wasm module scripts have special URLs.
 
 var g = newGlobal({newCompartment: true});
 var dbg = new Debugger(g);
 g.eval(`
 function initWasm(s) { return new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary(s))); }
 o1 = initWasm('(module (func) (export "" 0))');
--- a/js/src/jit-test/tests/debug/wasm-breakpoint.js
+++ b/js/src/jit-test/tests/debug/wasm-breakpoint.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Tests that wasm module scripts handles basic breakpoint operations.
 
 load(libdir + "wasm.js");
 
 function runTest(wast, initFunc, doneFunc) {
     let g = newGlobal({newCompartment: true});
     let dbg = new Debugger(g);
 
--- a/js/src/jit-test/tests/debug/wasm-get-return.js
+++ b/js/src/jit-test/tests/debug/wasm-get-return.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Tests that wasm frame opPop event can access function resumption value.
 
 load(libdir + "wasm.js");
 load(libdir + 'eqArrayHelper.js');
 
 function monitorFrameOnPopReturns(wast, expected) {
     var values = [];
     wasmRunWithDebugger(
--- a/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
+++ b/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 
 // Tests that wasm module scripts have column and line to bytecode offset
 // information when source text is generated.
 
 load(libdir + "asserts.js");
 
 // Checking if experimental format generates internal source map to binary file
 // by querying debugger scripts getAllColumnOffsets.
--- a/js/src/jit-test/tests/debug/wasm-responseurls.js
+++ b/js/src/jit-test/tests/debug/wasm-responseurls.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 // Tests that wasm module can accept URL and sourceMapURL from response
 // when instantiateStreaming is used.
 
 ignoreUnhandledRejections();
 
 try {
     WebAssembly.compileStreaming();
 } catch (err) {
--- a/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
+++ b/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 
 // Tests that wasm module sourceMappingURL section is parsed.
 
 load(libdir + "asserts.js");
 load(libdir + "wasm-binary.js");
 
 var g = newGlobal({newCompartment: true});
 var dbg = new Debugger(g);
--- a/js/src/jit-test/tests/debug/wasm-step.js
+++ b/js/src/jit-test/tests/debug/wasm-step.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-compiler-ion; skip-if: !wasmDebuggingIsSupported()
+// |jit-test| test-also=--wasm-compiler=ion; skip-if: !wasmDebuggingIsSupported()
 
 // Tests that wasm module scripts raises onEnterFrame and onLeaveFrame events.
 
 load(libdir + "wasm.js");
 
 // Checking if we stop at every wasm instruction during step.
 var onEnterFrameCalled, onLeaveFrameCalled, onStepCalled;
 wasmRunWithDebugger(
--- a/js/src/jit-test/tests/wasm/bench/directives.txt
+++ b/js/src/jit-test/tests/wasm/bench/directives.txt
@@ -1,1 +1,1 @@
-|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm.js
+|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js
--- a/js/src/jit-test/tests/wasm/directives.txt
+++ b/js/src/jit-test/tests/wasm/directives.txt
@@ -1,1 +1,1 @@
-|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm.js
+|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js
--- a/js/src/jit-test/tests/wasm/regress/directives.txt
+++ b/js/src/jit-test/tests/wasm/regress/directives.txt
@@ -1,1 +1,1 @@
-|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm.js
+|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js
--- a/js/src/jit-test/tests/wasm/spec/directives.txt
+++ b/js/src/jit-test/tests/wasm/spec/directives.txt
@@ -1,1 +1,1 @@
-|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm-testharness.js
+|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm-testharness.js
--- a/js/src/jit-test/tests/wasm/timeout/directives.txt
+++ b/js/src/jit-test/tests/wasm/timeout/directives.txt
@@ -1,2 +1,2 @@
-|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering
+|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2
 
--- a/js/src/tests/lib/jittests.py
+++ b/js/src/tests/lib/jittests.py
@@ -122,21 +122,16 @@ class JitTest:
         # True means CrashAtUnhandlableOOM is not considered a failure
         self.allow_unhandlable_oom = False
         # True means that hitting recursion the limits is not considered a failure.
         self.allow_overrecursed = False
         # True means run under valgrind
         self.valgrind = False
         # True means force Pacific time for the test
         self.tz_pacific = False
-        # True means run with and without asm.js
-        self.test_also_noasmjs = False
-        # enabled.
-        # True means run with and and without wasm baseline compiler enabled.
-        self.test_also_wasm_baseline = False
         # Additional files to include, in addition to prologue.js
         self.other_includes = []
         # List of other configurations to test with.
         self.test_also = []
         # List of other configurations to test with all existing variants.
         self.test_join = []
         # Errors to expect and consider passing
         self.expect_error = ''
@@ -160,18 +155,16 @@ class JitTest:
         t = JitTest(self.path)
         t.jitflags = self.jitflags[:]
         t.slow = self.slow
         t.allow_oom = self.allow_oom
         t.allow_unhandlable_oom = self.allow_unhandlable_oom
         t.allow_overrecursed = self.allow_overrecursed
         t.valgrind = self.valgrind
         t.tz_pacific = self.tz_pacific
-        t.test_also_noasmjs = self.test_also_noasmjs
-        t.test_also_wasm_baseline = self.test_also_wasm_baseline
         t.other_includes = self.other_includes[:]
         t.test_also = self.test_also
         t.test_join = self.test_join
         t.expect_error = self.expect_error
         t.expect_status = self.expect_status
         t.expect_crash = self.expect_crash
         t.test_reflect_stringify = self.test_reflect_stringify
         t.enable = True
@@ -296,28 +289,16 @@ class JitTest:
                     elif name == 'allow-unhandlable-oom':
                         test.allow_unhandlable_oom = True
                     elif name == 'allow-overrecursed':
                         test.allow_overrecursed = True
                     elif name == 'valgrind':
                         test.valgrind = options.valgrind
                     elif name == 'tz-pacific':
                         test.tz_pacific = True
-                    elif name == 'test-also-noasmjs':
-                        if options.asmjs_enabled:
-                            test.test_also.append(['--no-asmjs'])
-                    elif name == 'test-also-wasm-compiler-ion':
-                        if options.wasm_enabled:
-                            test.test_also.append(['--wasm-compiler=ion'])
-                    elif name == 'test-also-wasm-compiler-baseline':
-                        if options.wasm_enabled:
-                            test.test_also.append(['--wasm-compiler=baseline'])
-                    elif name == 'test-also-wasm-tiering':
-                        if options.wasm_enabled:
-                            test.test_also.append(['--test-wasm-await-tier2'])
                     elif name.startswith('test-also='):
                         test.test_also.append([name[len('test-also='):]])
                     elif name.startswith('test-join='):
                         test.test_join.append([name[len('test-join='):]])
                     elif name == 'module':
                         test.is_module = True
                     elif name == 'crash':
                         test.expect_crash = True
--- a/js/src/wasm/Makefile
+++ b/js/src/wasm/Makefile
@@ -18,17 +18,17 @@ help:
 
 update:
 	[ -d ./spec ] || git clone https://github.com/webassembly/spec ./spec
 	(cd ./spec/interpreter && make)
 	./spec/test/build.py \
 		--use-sync \
 		--js ../jit-test/tests/wasm/spec \
 		--html ../../../testing/web-platform/mozilla/tests/wasm
-	echo "|jit-test| test-also-wasm-compiler-ion; test-also-wasm-compiler-baseline; test-also-wasm-tiering; include:wasm-testharness.js" > ../jit-test/tests/wasm/spec/directives.txt
+	echo "|jit-test| test-also=--wasm-compiler=ion; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm-testharness.js" > ../jit-test/tests/wasm/spec/directives.txt
 	echo "|jit-test| skip-if:true" > ../jit-test/tests/wasm/spec/harness/directives.txt
 
 run:
 	@[ -z $(MOZCONFIG) ] && echo "You need to define the MOZCONFIG env variable first."
 	@[ -z $(MOZCONFIG) ] || ../../../mach wpt /_mozilla/wasm
 
 expectations:
 	@[ -z $(MOZCONFIG) ] && echo "You need to define the MOZCONFIG env variable first." || true