Bug 1277562 - Part 5b: Adapt test cases. r=yury
authorLars T Hansen <lhansen@mozilla.com>
Thu, 29 Jun 2017 14:49:43 -0700
changeset 427599 b425ac7ad630cc85faba037c18608613bd1e9125
parent 427598 9ea44ef0c07c277dd349096d4d71d3cb9f768d6b
child 427600 293183f088dc120fc4ab1d0bdfcc8818eadd6d97
push id1567
push userjlorenzo@mozilla.com
push dateThu, 02 Nov 2017 12:36:05 +0000
treeherdermozilla-release@e512c14a0406 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersyury
bugs1277562
milestone57.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 1277562 - Part 5b: Adapt test cases. r=yury
js/src/jit-test/tests/debug/Script-format-01.js
js/src/jit-test/tests/debug/bug1257045.js
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/bug1351059.js
js/src/jit-test/tests/debug/wasm-01.js
js/src/jit-test/tests/debug/wasm-02.js
js/src/jit-test/tests/debug/wasm-03.js
js/src/jit-test/tests/debug/wasm-04.js
js/src/jit-test/tests/debug/wasm-05.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-13.js
js/src/jit-test/tests/debug/wasm-binary-sources.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-jseval.js
js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.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/debug-interrupt-1.js
js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js
js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js
js/src/jit-test/tests/wasm/timeout/directives.txt
--- a/js/src/jit-test/tests/debug/Script-format-01.js
+++ b/js/src/jit-test/tests/debug/Script-format-01.js
@@ -1,11 +1,14 @@
 // Tests that JavaScript scripts have a "js" format and wasm scripts have a
 // "wasm" format.
 
+if (!wasmDebuggingIsSupported())
+    quit(0);
+
 var g = newGlobal();
 var dbg = new Debugger(g);
 
 var gotScript;
 dbg.onNewScript = (script) => {
   gotScript = script;
 };
 
--- a/js/src/jit-test/tests/debug/bug1257045.js
+++ b/js/src/jit-test/tests/debug/bug1257045.js
@@ -1,9 +1,9 @@
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 fullcompartmentchecks(true);
 var g = newGlobal();
 var dbg = new Debugger(g);
 dbg.onNewScript = (function(script) {
     s = script;
 })
--- a/js/src/jit-test/tests/debug/bug1330339.js
+++ b/js/src/jit-test/tests/debug/bug1330339.js
@@ -1,11 +1,11 @@
-// |jit-test| test-also-wasm-baseline; error: TestComplete
+// |jit-test| test-also-no-wasm-baseline; error: TestComplete
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
      throw "TestComplete";
 
 let module = new WebAssembly.Module(wasmTextToBinary(`
     (module
         (import "global" "func")
         (func (export "test")
          call 0 ;; calls the import, which is func #0
         )
--- a/js/src/jit-test/tests/debug/bug1330489-sps.js
+++ b/js/src/jit-test/tests/debug/bug1330489-sps.js
@@ -1,13 +1,13 @@
-// |jit-test| test-also-wasm-baseline; error: TestComplete
+// |jit-test| test-also-no-wasm-baseline; error: TestComplete
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     throw "TestComplete";
 
 // Single-step profiling currently only works in the ARM simulator
 if (!getBuildConfiguration()["arm-simulator"])
     throw "TestComplete";
 
 enableGeckoProfiling();
 enableSingleStepProfiling();
--- a/js/src/jit-test/tests/debug/bug1330489.js
+++ b/js/src/jit-test/tests/debug/bug1330489.js
@@ -1,13 +1,13 @@
-// |jit-test| test-also-wasm-baseline; error: TestComplete
+// |jit-test| test-also-no-wasm-baseline; error: TestComplete
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     throw "TestComplete";
 
 var g = newGlobal();
 g.parent = this;
 g.eval("Debugger(parent).onExceptionUnwind = function () {};");
 
 let module = new WebAssembly.Module(wasmTextToBinary(`
     (module
--- a/js/src/jit-test/tests/debug/bug1330491.js
+++ b/js/src/jit-test/tests/debug/bug1330491.js
@@ -1,11 +1,11 @@
-// |jit-test| test-also-wasm-baseline; error: TestComplete
+// |jit-test| test-also-no-wasm-baseline; error: TestComplete
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
      throw "TestComplete";
 
 (function createShortLivedDebugger() {
     var g = newGlobal();
     g.debuggeeGlobal = this;
     g.eval("(" + function () {
         dbg = new Debugger(debuggeeGlobal);
     } + ")();");
@@ -13,9 +13,9 @@ if (!wasmIsSupported())
 
 let module = new WebAssembly.Module(wasmTextToBinary('(module (func))'));
 new WebAssembly.Instance(module);
 
 gcslice(1000000);
 
 new WebAssembly.Instance(module);
 
-throw "TestComplete";
\ No newline at end of file
+throw "TestComplete";
--- a/js/src/jit-test/tests/debug/bug1331064.js
+++ b/js/src/jit-test/tests/debug/bug1331064.js
@@ -1,14 +1,14 @@
-// |jit-test| test-also-wasm-baseline; exitstatus: 3
+// |jit-test| test-also-no-wasm-baseline; exitstatus: 3
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
-     quit(3);
+if (!wasmDebuggingIsSupported())
+    quit(3);
 
 var g = newGlobal();
 g.parent = this;
 g.eval("new Debugger(parent).onExceptionUnwind = function () {  some_error; };");
 
 var module = new WebAssembly.Module(wasmTextToBinary(`
 (module
     (import $imp "a" "b" (result i32))
--- a/js/src/jit-test/tests/debug/bug1331592.js
+++ b/js/src/jit-test/tests/debug/bug1331592.js
@@ -1,11 +1,11 @@
-// |jit-test| test-also-wasm-baseline; error: TestComplete
+// |jit-test| test-also-no-wasm-baseline; error: TestComplete
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
      throw "TestComplete";
 
 var module = new WebAssembly.Module(wasmTextToBinary(`
     (module
         (import "global" "func" (result i32))
         (func (export "func_0") (result i32)
          call 0 ;; calls the import, which is func #0
         )
--- a/js/src/jit-test/tests/debug/bug1332493.js
+++ b/js/src/jit-test/tests/debug/bug1332493.js
@@ -1,12 +1,12 @@
-// |jit-test| test-also-wasm-baseline; exitstatus: 3
+// |jit-test| test-also-no-wasm-baseline; exitstatus: 3
 // Checking in debug frame is initialized properly during stack overflow.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit(3);
 
 var dbg;
 (function () { dbg = new (newGlobal().Debugger)(this); })();
 
 if (!wasmIsSupported())
      throw "TestComplete";
 
--- a/js/src/jit-test/tests/debug/bug1343579.js
+++ b/js/src/jit-test/tests/debug/bug1343579.js
@@ -1,13 +1,16 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Checking if Debugger.Script.isInCatchScope return false for wasm.
 
 load(libdir + "wasm.js");
 
+if (!wasmDebuggingIsSupported())
+    quit();
+
 var results;
 wasmRunWithDebugger(
     '(module (memory 1) ' +
     '(func $func0 i32.const 1000000 i32.load drop) ' +
     '(func (export "test") call $func0))',
     undefined,
     function ({dbg, wasmScript}) {
         results = [];
--- a/js/src/jit-test/tests/debug/bug1351059.js
+++ b/js/src/jit-test/tests/debug/bug1351059.js
@@ -1,14 +1,14 @@
 // Tests that onEnterFrame events are enabled when Debugger callbacks set
 // before Instance creation.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 g.parent = this;
 g.onEnterFrameCalled = false;
 g.eval(`
     var dbg = new Debugger(parent);
     dbg.onEnterFrame = frame => {
--- a/js/src/jit-test/tests/debug/wasm-01.js
+++ b/js/src/jit-test/tests/debug/wasm-01.js
@@ -1,11 +1,11 @@
 // Tests that wasm module scripts are available via findScripts.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 g.eval(`o = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func) (export "" 0))')));`);
 
 function isWasm(script) { return script.format === "wasm"; }
 
 var dbg = new Debugger(g);
--- a/js/src/jit-test/tests/debug/wasm-02.js
+++ b/js/src/jit-test/tests/debug/wasm-02.js
@@ -1,11 +1,11 @@
 // Tests that wasm module scripts are available via onNewScript.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 var dbg = new Debugger(g);
 
 var gotScript;
 dbg.onNewScript = (script) => {
   gotScript = script;
--- a/js/src/jit-test/tests/debug/wasm-03.js
+++ b/js/src/jit-test/tests/debug/wasm-03.js
@@ -1,13 +1,13 @@
 // Tests that wasm module scripts have synthesized sources.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 var dbg = new Debugger(g);
 
 var s;
 dbg.onNewScript = (script) => {
   s = script;
--- a/js/src/jit-test/tests/debug/wasm-04.js
+++ b/js/src/jit-test/tests/debug/wasm-04.js
@@ -1,13 +1,13 @@
 // Tests that wasm module scripts throw for everything except text.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 var dbg = new Debugger(g);
 
 var s;
 dbg.onNewScript = (script) => {
   s = script;
--- a/js/src/jit-test/tests/debug/wasm-05.js
+++ b/js/src/jit-test/tests/debug/wasm-05.js
@@ -1,15 +1,15 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts have text line to bytecode offset information
 // when source text is generated.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
      quit();
 
 // Checking if experimental format generates internal source map to binary file
 // by querying debugger scripts getLineOffsets.
 // (Notice that the source map will not be produced by wasmBinaryToText)
 function getAllOffsets(wast) {
   var sandbox = newGlobal('');
   var dbg = new Debugger();
--- 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,14 +1,14 @@
-// |jit-test| test-also-wasm-baseline; exitstatus: 3
+// |jit-test| test-also-no-wasm-baseline; exitstatus: 3
 // Checking resumption values for 'null' at onEnterFrame.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
      quit(3);
 
 var g = newGlobal('');
 var dbg = new Debugger();
 dbg.addDebuggee(g);
 sandbox.eval(`
 var wasm = wasmTextToBinary('(module (func (nop)) (export "test" 0))');
 var m = new WebAssembly.Instance(new WebAssembly.Module(wasm));`);
--- 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,15 +1,15 @@
-// |jit-test| test-also-wasm-baseline; exitstatus: 3
+// |jit-test| test-also-no-wasm-baseline; exitstatus: 3
 // Checking resumption values for 'null' at frame's onPop.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
-     quit(3);
+if (!wasmDebuggingIsSupported())
+    quit(3);
 
 var g = newGlobal('');
 var dbg = new Debugger();
 dbg.addDebuggee(g);
 sandbox.eval(`
 var wasm = wasmTextToBinary('(module (func (nop)) (export "test" 0))');
 var m = new WebAssembly.Instance(new WebAssembly.Module(wasm));`);
 dbg.onEnterFrame = function (frame) {
--- a/js/src/jit-test/tests/debug/wasm-06.js
+++ b/js/src/jit-test/tests/debug/wasm-06.js
@@ -1,15 +1,15 @@
-// |jit-test| test-also-wasm-baseline; error: TestComplete
+// |jit-test| test-also-no-wasm-baseline; error: TestComplete
 // Tests that wasm module scripts raises onEnterFrame and onLeaveFrame events.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
-     throw "TestComplete";
+if (!wasmDebuggingIsSupported())
+    throw "TestComplete";
 
 function runWasmWithDebugger(wast, lib, init, done) {
     let g = newGlobal('');
     let dbg = new Debugger(g);
 
     g.eval(`
 var wasm = wasmTextToBinary('${wast}');
 var lib = ${lib || 'undefined'};
--- a/js/src/jit-test/tests/debug/wasm-07.js
+++ b/js/src/jit-test/tests/debug/wasm-07.js
@@ -1,15 +1,18 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // 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");
 
+if (!wasmDebuggingIsSupported())
+    quit();
+
 var offsets;
 wasmRunWithDebugger(
     '(module (func (nop) (nop)) (export "test" 0))',
     undefined,
     function ({dbg}) {
         offsets = [];
         dbg.onEnterFrame = function (frame) {
             if (frame.type != 'wasmcall') return;
--- a/js/src/jit-test/tests/debug/wasm-08.js
+++ b/js/src/jit-test/tests/debug/wasm-08.js
@@ -1,13 +1,16 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Checking if we destroying work registers by breakpoint/step handler.
 
 load(libdir + "wasm.js");
 
+if (!wasmDebuggingIsSupported())
+    quit();
+
 // 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;
 //         for (;n > 0; n--) {
 //             a *= c; b += c; c++; d <<= 1;
 //         }
 //         return (signed)a + (signed)b + c + (signed)d;
--- a/js/src/jit-test/tests/debug/wasm-09.js
+++ b/js/src/jit-test/tests/debug/wasm-09.js
@@ -1,15 +1,15 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests debugEnabled state of wasm when allowUnobservedAsmJS == true.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
-     quit();
+if (!wasmDebuggingIsSupported())
+    quit();
 
 // 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('');
     var dbg = new Debugger();
     dbg.allowUnobservedAsmJS = true;
     dbg.addDebuggee(sandbox);
--- a/js/src/jit-test/tests/debug/wasm-10.js
+++ b/js/src/jit-test/tests/debug/wasm-10.js
@@ -1,14 +1,17 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts has inspectable locals.
 
 load(libdir + "wasm.js");
 load(libdir + 'eqArrayHelper.js');
 
+if (!wasmDebuggingIsSupported())
+    quit();
+
 function monitorLocalValues(wast, lib, expected) {
     function setupFrame(frame) {
         var locals = {};
         framesLocals.push(locals);
         frame.environment.names().forEach(n => {
             locals[n] = [frame.environment.getVariable(n)];
         });
         frame.onStep = function () {
--- a/js/src/jit-test/tests/debug/wasm-11.js
+++ b/js/src/jit-test/tests/debug/wasm-11.js
@@ -1,12 +1,13 @@
+// |jit-test| test-also-no-wasm-baseline
 // Test single-stepping where the TLS register can be evicted by a non-trivial
 // function body.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 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,11 +1,12 @@
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts have special URLs.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 g.eval(`
 function initWasm(s) { return new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary(s))); }
 o1 = initWasm('(module (func) (export "" 0))');
 o2 = initWasm('(module (func) (func) (export "" 1))');
 `);
--- a/js/src/jit-test/tests/debug/wasm-13.js
+++ b/js/src/jit-test/tests/debug/wasm-13.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts has inspectable globals and memory.
 
 load(libdir + "wasm.js");
 load(libdir + 'eqArrayHelper.js');
 
 function monitorGlobalValues(wast, lib, expected) {
     function setupFrame(frame) {
         var globals = {};
--- a/js/src/jit-test/tests/debug/wasm-binary-sources.js
+++ b/js/src/jit-test/tests/debug/wasm-binary-sources.js
@@ -1,14 +1,14 @@
 // Tests that wasm module scripts have access to binary sources.
 
 load(libdir + "asserts.js");
 load(libdir + "array-compare.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
 var dbg = new Debugger(g);
 
 var s;
 dbg.onNewScript = (script) => {
   s = script;
--- a/js/src/jit-test/tests/debug/wasm-breakpoint.js
+++ b/js/src/jit-test/tests/debug/wasm-breakpoint.js
@@ -1,13 +1,16 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts handles basic breakpoint operations.
 
 load(libdir + "wasm.js");
 
+if (!wasmDebuggingIsSupported())
+    quit();
+
 // Checking if we can stop at specified breakpoint.
 var onBreakpointCalled;
 wasmRunWithDebugger(
     '(module (func (nop) (nop)) (export "test" 0))',
     undefined,
     function ({wasmScript}) {
         var breakpoints = wasmGetScriptBreakpoints(wasmScript);
         assertEq(breakpoints.length, 3);
--- a/js/src/jit-test/tests/debug/wasm-get-return.js
+++ b/js/src/jit-test/tests/debug/wasm-get-return.js
@@ -1,14 +1,17 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm frame opPop event can access function resumption value.
 
 load(libdir + "wasm.js");
 load(libdir + 'eqArrayHelper.js');
 
+if (!wasmDebuggingIsSupported())
+  quit();
+
 function monitorFrameOnPopReturns(wast, expected) {
     var values = [];
     wasmRunWithDebugger(
         wast,
         undefined,
         function ({dbg}) {
             dbg.onEnterFrame = function (frame) {
                 if (frame.type != 'wasmcall') return;
--- a/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
+++ b/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
@@ -1,15 +1,15 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts have column and line to bytecode offset
 // information when source text is generated.
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
      quit();
 
 // Checking if experimental format generates internal source map to binary file
 // by querying debugger scripts getAllColumnOffsets.
 // (Notice that the source map will not be produced by wasmBinaryToText)
 function getAllOffsets(wast) {
   var sandbox = newGlobal('');
   var dbg = new Debugger();
--- a/js/src/jit-test/tests/debug/wasm-jseval.js
+++ b/js/src/jit-test/tests/debug/wasm-jseval.js
@@ -1,9 +1,9 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that JS can be evaluated on wasm module scripts frames.
 
 load(libdir + "wasm.js");
 
 wasmRunWithDebugger(
     '(module (memory 1 1)\
      (global (mut f64) (f64.const 0.5))\
      (global f32 (f32.const 3.5))\
--- a/js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js
+++ b/js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js
@@ -1,10 +1,10 @@
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit();
 
 var sandbox = newGlobal();
 var dbg = new Debugger(sandbox);
 var counter = 0;
 dbg.onExceptionUnwind = (frame, value) => {
     if (frame.type !== "wasmcall")
         return;
--- a/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
+++ b/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
@@ -1,12 +1,12 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module sourceMappingURL section is parsed.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 load(libdir + "asserts.js");
 load(libdir + "wasm-binary.js");
 
 var g = newGlobal();
 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,13 +1,16 @@
-// |jit-test| test-also-wasm-baseline
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts raises onEnterFrame and onLeaveFrame events.
 
 load(libdir + "wasm.js");
 
+if (!wasmDebuggingIsSupported())
+    quit();
+
 // Checking if we stop at every wasm instruction during step.
 var onEnterFrameCalled, onLeaveFrameCalled, onStepCalled;
 wasmRunWithDebugger(
     '(module (func (nop) (nop)) (export "test" 0))',
     undefined,
     function ({dbg}) {
         onEnterFrameCalled = 0;
         onLeaveFrameCalled = 0;
@@ -57,9 +60,8 @@ wasmRunWithDebugger(
     },
     function ({error}) {
         assertEq(error, undefined);
         assertEq(onEnterFrameCalled, 1);
         assertEq(onLeaveFrameCalled, 0);
         assertEq(onStepCalled.length, 0);
     }
 );
-
--- 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-baseline; test-also-wasm-check-bce; include:wasm.js
+|jit-test| test-also-no-wasm-baseline; test-also-wasm-check-bce; 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-baseline; include:wasm.js
+|jit-test| test-also-no-wasm-baseline; 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-baseline; include:wasm.js
+|jit-test| test-also-no-wasm-baseline; 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-baseline; include:wasm-testharness.js
+|jit-test| test-also-no-wasm-baseline; include:wasm-testharness.js
--- a/js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js
+++ b/js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js
@@ -1,13 +1,13 @@
 // |jit-test| exitstatus: 6;
 
 // Don't include wasm.js in timeout tests: when wasm isn't supported, it will
 // quit(0) which will cause the test to fail.
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit(6);
 
 var g = newGlobal();
 g.parent = this;
 g.eval("Debugger(parent).onEnterFrame = function() {};");
 timeout(0.01);
 var code = wasmTextToBinary(`(module
     (func (export "f1")
--- a/js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js
+++ b/js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js
@@ -1,13 +1,13 @@
 // |jit-test| exitstatus: 6;
 
 // Don't include wasm.js in timeout tests: when wasm isn't supported, it will
 // quit(0) which will cause the test to fail.
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit(6);
 
 var g = newGlobal();
 g.parent = this;
 g.eval("Debugger(parent).onEnterFrame = function() {};");
 timeout(0.01);
 var code = wasmTextToBinary(`(module
     (func $f2
--- a/js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js
+++ b/js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js
@@ -1,13 +1,13 @@
 // |jit-test| exitstatus: 6;
 
 // Don't include wasm.js in timeout tests: when wasm isn't supported, it will
 // quit(0) which will cause the test to fail.
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit(6);
 
 newGlobal().Debugger().addDebuggee(this);
 
 var t = new WebAssembly.Table({
     initial: 1,
     element: "anyfunc"
 });
--- 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-baseline
+|jit-test| test-also-no-wasm-baseline