From 52006b201a9caf8f4ccd2ec7358c06e1cdd6df7d Mon Sep 17 00:00:00 2001
From: Lars T Hansen <lhansen@mozilla.com>
Date: Thu, 29 Jun 2017 14:49:43 -0700
Subject: [PATCH] Bug 1277562 - Part 5b: Adapt test cases. r=yury

--HG--
extra : rebase_source : 545315ea97844eed615e2dd6fd380f34d4d09623
---
 js/src/jit-test/tests/debug/Script-format-01.js          | 3 +++
 js/src/jit-test/tests/debug/bug1257045.js                | 2 +-
 js/src/jit-test/tests/debug/bug1330339.js                | 4 ++--
 js/src/jit-test/tests/debug/bug1330489-sps.js            | 4 ++--
 js/src/jit-test/tests/debug/bug1330489.js                | 4 ++--
 js/src/jit-test/tests/debug/bug1330491.js                | 6 +++---
 js/src/jit-test/tests/debug/bug1331064.js                | 6 +++---
 js/src/jit-test/tests/debug/bug1331592.js                | 4 ++--
 js/src/jit-test/tests/debug/bug1332493.js                | 4 ++--
 js/src/jit-test/tests/debug/bug1343579.js                | 5 ++++-
 js/src/jit-test/tests/debug/bug1351059.js                | 2 +-
 js/src/jit-test/tests/debug/wasm-01.js                   | 2 +-
 js/src/jit-test/tests/debug/wasm-02.js                   | 2 +-
 js/src/jit-test/tests/debug/wasm-03.js                   | 2 +-
 js/src/jit-test/tests/debug/wasm-04.js                   | 2 +-
 js/src/jit-test/tests/debug/wasm-05.js                   | 4 ++--
 js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js | 4 ++--
 js/src/jit-test/tests/debug/wasm-06-onPop-null.js        | 6 +++---
 js/src/jit-test/tests/debug/wasm-06.js                   | 6 +++---
 js/src/jit-test/tests/debug/wasm-07.js                   | 5 ++++-
 js/src/jit-test/tests/debug/wasm-08.js                   | 5 ++++-
 js/src/jit-test/tests/debug/wasm-09.js                   | 6 +++---
 js/src/jit-test/tests/debug/wasm-10.js                   | 5 ++++-
 js/src/jit-test/tests/debug/wasm-11.js                   | 3 ++-
 js/src/jit-test/tests/debug/wasm-12.js                   | 3 ++-
 js/src/jit-test/tests/debug/wasm-13.js                   | 2 +-
 js/src/jit-test/tests/debug/wasm-binary-sources.js       | 2 +-
 js/src/jit-test/tests/debug/wasm-breakpoint.js           | 5 ++++-
 js/src/jit-test/tests/debug/wasm-get-return.js           | 5 ++++-
 js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js  | 4 ++--
 js/src/jit-test/tests/debug/wasm-jseval.js               | 2 +-
 js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js | 2 +-
 js/src/jit-test/tests/debug/wasm-sourceMappingURL.js     | 4 ++--
 js/src/jit-test/tests/debug/wasm-step.js                 | 6 ++++--
 js/src/jit-test/tests/wasm/bench/directives.txt          | 2 +-
 js/src/jit-test/tests/wasm/directives.txt                | 2 +-
 js/src/jit-test/tests/wasm/regress/directives.txt        | 2 +-
 js/src/jit-test/tests/wasm/spec/directives.txt           | 2 +-
 js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js  | 2 +-
 js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js  | 2 +-
 js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js  | 2 +-
 js/src/jit-test/tests/wasm/timeout/directives.txt        | 2 +-
 42 files changed, 86 insertions(+), 61 deletions(-)

diff --git a/js/src/jit-test/tests/debug/Script-format-01.js b/js/src/jit-test/tests/debug/Script-format-01.js
index 008de4e6247e..3b7999b853fe 100644
--- a/js/src/jit-test/tests/debug/Script-format-01.js
+++ b/js/src/jit-test/tests/debug/Script-format-01.js
@@ -1,6 +1,9 @@
 // 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);
 
diff --git a/js/src/jit-test/tests/debug/bug1257045.js b/js/src/jit-test/tests/debug/bug1257045.js
index a6437b308ec7..c105c31536d3 100644
--- a/js/src/jit-test/tests/debug/bug1257045.js
+++ b/js/src/jit-test/tests/debug/bug1257045.js
@@ -1,4 +1,4 @@
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 fullcompartmentchecks(true);
diff --git a/js/src/jit-test/tests/debug/bug1330339.js b/js/src/jit-test/tests/debug/bug1330339.js
index 1c1017f3a3c0..03ba38d8d46f 100644
--- a/js/src/jit-test/tests/debug/bug1330339.js
+++ b/js/src/jit-test/tests/debug/bug1330339.js
@@ -1,6 +1,6 @@
-// |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(`
diff --git a/js/src/jit-test/tests/debug/bug1330489-sps.js b/js/src/jit-test/tests/debug/bug1330489-sps.js
index 09861c6e4ca8..edcc95011582 100644
--- a/js/src/jit-test/tests/debug/bug1330489-sps.js
+++ b/js/src/jit-test/tests/debug/bug1330489-sps.js
@@ -1,8 +1,8 @@
-// |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
diff --git a/js/src/jit-test/tests/debug/bug1330489.js b/js/src/jit-test/tests/debug/bug1330489.js
index 295843337c2e..529452f98e44 100644
--- a/js/src/jit-test/tests/debug/bug1330489.js
+++ b/js/src/jit-test/tests/debug/bug1330489.js
@@ -1,8 +1,8 @@
-// |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();
diff --git a/js/src/jit-test/tests/debug/bug1330491.js b/js/src/jit-test/tests/debug/bug1330491.js
index 858e76918c3a..72087f1d005c 100644
--- a/js/src/jit-test/tests/debug/bug1330491.js
+++ b/js/src/jit-test/tests/debug/bug1330491.js
@@ -1,6 +1,6 @@
-// |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() {
@@ -18,4 +18,4 @@ gcslice(1000000);
 
 new WebAssembly.Instance(module);
 
-throw "TestComplete";
\ No newline at end of file
+throw "TestComplete";
diff --git a/js/src/jit-test/tests/debug/bug1331064.js b/js/src/jit-test/tests/debug/bug1331064.js
index cef20137193c..d35d6e98b98e 100644
--- 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-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;
diff --git a/js/src/jit-test/tests/debug/bug1331592.js b/js/src/jit-test/tests/debug/bug1331592.js
index 2b31b5ac21b6..14526d41790b 100644
--- a/js/src/jit-test/tests/debug/bug1331592.js
+++ b/js/src/jit-test/tests/debug/bug1331592.js
@@ -1,6 +1,6 @@
-// |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(`
diff --git a/js/src/jit-test/tests/debug/bug1332493.js b/js/src/jit-test/tests/debug/bug1332493.js
index 6dbec8ba2baa..184360d63689 100644
--- a/js/src/jit-test/tests/debug/bug1332493.js
+++ b/js/src/jit-test/tests/debug/bug1332493.js
@@ -1,7 +1,7 @@
-// |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;
diff --git a/js/src/jit-test/tests/debug/bug1343579.js b/js/src/jit-test/tests/debug/bug1343579.js
index 61c69ed50955..28b216378fe5 100644
--- a/js/src/jit-test/tests/debug/bug1343579.js
+++ b/js/src/jit-test/tests/debug/bug1343579.js
@@ -1,8 +1,11 @@
-// |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) ' +
diff --git a/js/src/jit-test/tests/debug/bug1351059.js b/js/src/jit-test/tests/debug/bug1351059.js
index 0f34101ef9fb..a18c1a8a76e9 100644
--- a/js/src/jit-test/tests/debug/bug1351059.js
+++ b/js/src/jit-test/tests/debug/bug1351059.js
@@ -3,7 +3,7 @@
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-01.js b/js/src/jit-test/tests/debug/wasm-01.js
index 1b2908d0ff81..1f6e1b0a7cd7 100644
--- a/js/src/jit-test/tests/debug/wasm-01.js
+++ b/js/src/jit-test/tests/debug/wasm-01.js
@@ -1,6 +1,6 @@
 // Tests that wasm module scripts are available via findScripts.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-02.js b/js/src/jit-test/tests/debug/wasm-02.js
index e6b591b582b5..3bae0c145f7f 100644
--- a/js/src/jit-test/tests/debug/wasm-02.js
+++ b/js/src/jit-test/tests/debug/wasm-02.js
@@ -1,6 +1,6 @@
 // Tests that wasm module scripts are available via onNewScript.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-03.js b/js/src/jit-test/tests/debug/wasm-03.js
index 03e96bbf1c4d..593af1bed01a 100644
--- a/js/src/jit-test/tests/debug/wasm-03.js
+++ b/js/src/jit-test/tests/debug/wasm-03.js
@@ -2,7 +2,7 @@
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-04.js b/js/src/jit-test/tests/debug/wasm-04.js
index 5d6ad6799051..979e46917256 100644
--- a/js/src/jit-test/tests/debug/wasm-04.js
+++ b/js/src/jit-test/tests/debug/wasm-04.js
@@ -2,7 +2,7 @@
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-05.js b/js/src/jit-test/tests/debug/wasm-05.js
index 48011d07f7de..9332baa275e3 100644
--- a/js/src/jit-test/tests/debug/wasm-05.js
+++ b/js/src/jit-test/tests/debug/wasm-05.js
@@ -1,10 +1,10 @@
-// |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
diff --git a/js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js b/js/src/jit-test/tests/debug/wasm-06-onEnterFrame-null.js
index e678725a3b85..0c94075b5107 100644
--- 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-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('');
diff --git a/js/src/jit-test/tests/debug/wasm-06-onPop-null.js b/js/src/jit-test/tests/debug/wasm-06-onPop-null.js
index 0fda3313cf71..633a237ea28b 100644
--- 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,10 +1,10 @@
-// |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();
diff --git a/js/src/jit-test/tests/debug/wasm-06.js b/js/src/jit-test/tests/debug/wasm-06.js
index d1135840acde..711b2b18e0ee 100644
--- a/js/src/jit-test/tests/debug/wasm-06.js
+++ b/js/src/jit-test/tests/debug/wasm-06.js
@@ -1,10 +1,10 @@
-// |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('');
diff --git a/js/src/jit-test/tests/debug/wasm-07.js b/js/src/jit-test/tests/debug/wasm-07.js
index 5bdbb4d5ba8b..b045597c8ba0 100644
--- a/js/src/jit-test/tests/debug/wasm-07.js
+++ b/js/src/jit-test/tests/debug/wasm-07.js
@@ -1,10 +1,13 @@
-// |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))',
diff --git a/js/src/jit-test/tests/debug/wasm-08.js b/js/src/jit-test/tests/debug/wasm-08.js
index a9bdaa32e6fd..d738832bd24b 100644
--- a/js/src/jit-test/tests/debug/wasm-08.js
+++ b/js/src/jit-test/tests/debug/wasm-08.js
@@ -1,8 +1,11 @@
-// |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) {
diff --git a/js/src/jit-test/tests/debug/wasm-09.js b/js/src/jit-test/tests/debug/wasm-09.js
index f7042571f8b6..b376d24f699f 100644
--- a/js/src/jit-test/tests/debug/wasm-09.js
+++ b/js/src/jit-test/tests/debug/wasm-09.js
@@ -1,10 +1,10 @@
-// |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.
diff --git a/js/src/jit-test/tests/debug/wasm-10.js b/js/src/jit-test/tests/debug/wasm-10.js
index 3e51447d5834..36f56d20e8c1 100644
--- a/js/src/jit-test/tests/debug/wasm-10.js
+++ b/js/src/jit-test/tests/debug/wasm-10.js
@@ -1,9 +1,12 @@
-// |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 = {};
diff --git a/js/src/jit-test/tests/debug/wasm-11.js b/js/src/jit-test/tests/debug/wasm-11.js
index 76bf37024623..6c84c1ce5342 100644
--- a/js/src/jit-test/tests/debug/wasm-11.js
+++ b/js/src/jit-test/tests/debug/wasm-11.js
@@ -1,7 +1,8 @@
+// |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();
diff --git a/js/src/jit-test/tests/debug/wasm-12.js b/js/src/jit-test/tests/debug/wasm-12.js
index 9433934552c2..c6d782d15531 100644
--- a/js/src/jit-test/tests/debug/wasm-12.js
+++ b/js/src/jit-test/tests/debug/wasm-12.js
@@ -1,6 +1,7 @@
+// |jit-test| test-also-no-wasm-baseline
 // Tests that wasm module scripts have special URLs.
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-13.js b/js/src/jit-test/tests/debug/wasm-13.js
index 3b08c76a9b51..869ec3e73ab7 100644
--- a/js/src/jit-test/tests/debug/wasm-13.js
+++ b/js/src/jit-test/tests/debug/wasm-13.js
@@ -1,4 +1,4 @@
-// |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");
diff --git a/js/src/jit-test/tests/debug/wasm-binary-sources.js b/js/src/jit-test/tests/debug/wasm-binary-sources.js
index 05ebe31b164b..d352eef6543a 100644
--- a/js/src/jit-test/tests/debug/wasm-binary-sources.js
+++ b/js/src/jit-test/tests/debug/wasm-binary-sources.js
@@ -3,7 +3,7 @@
 load(libdir + "asserts.js");
 load(libdir + "array-compare.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-breakpoint.js b/js/src/jit-test/tests/debug/wasm-breakpoint.js
index 8ccd9e6a6453..249342907b7e 100644
--- a/js/src/jit-test/tests/debug/wasm-breakpoint.js
+++ b/js/src/jit-test/tests/debug/wasm-breakpoint.js
@@ -1,8 +1,11 @@
-// |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(
diff --git a/js/src/jit-test/tests/debug/wasm-get-return.js b/js/src/jit-test/tests/debug/wasm-get-return.js
index e7675a91f19a..6af900b6adce 100644
--- 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,12 @@
-// |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(
diff --git a/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js b/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
index 5d2353dfbd77..70e6ab1f3b92 100644
--- a/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
+++ b/js/src/jit-test/tests/debug/wasm-getAllColumnOffsets.js
@@ -1,10 +1,10 @@
-// |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
diff --git a/js/src/jit-test/tests/debug/wasm-jseval.js b/js/src/jit-test/tests/debug/wasm-jseval.js
index 7c39b4a39b60..8903131a144d 100644
--- a/js/src/jit-test/tests/debug/wasm-jseval.js
+++ b/js/src/jit-test/tests/debug/wasm-jseval.js
@@ -1,4 +1,4 @@
-// |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");
diff --git a/js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js b/js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js
index ca191ea0f772..7e38b88bd899 100644
--- a/js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js
+++ b/js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js
@@ -1,5 +1,5 @@
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit();
 
 var sandbox = newGlobal();
diff --git a/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js b/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
index cfe63d64466c..512b0ccdb292 100644
--- a/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
+++ b/js/src/jit-test/tests/debug/wasm-sourceMappingURL.js
@@ -1,7 +1,7 @@
-// |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");
diff --git a/js/src/jit-test/tests/debug/wasm-step.js b/js/src/jit-test/tests/debug/wasm-step.js
index b8db1ccaf84a..7896e25656c1 100644
--- a/js/src/jit-test/tests/debug/wasm-step.js
+++ b/js/src/jit-test/tests/debug/wasm-step.js
@@ -1,8 +1,11 @@
-// |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(
@@ -62,4 +65,3 @@ wasmRunWithDebugger(
         assertEq(onStepCalled.length, 0);
     }
 );
-
diff --git a/js/src/jit-test/tests/wasm/bench/directives.txt b/js/src/jit-test/tests/wasm/bench/directives.txt
index 511562f531d2..937ec233e4ab 100644
--- a/js/src/jit-test/tests/wasm/bench/directives.txt
+++ b/js/src/jit-test/tests/wasm/bench/directives.txt
@@ -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
diff --git a/js/src/jit-test/tests/wasm/directives.txt b/js/src/jit-test/tests/wasm/directives.txt
index 8546e536a7b2..eab4d13e3746 100644
--- a/js/src/jit-test/tests/wasm/directives.txt
+++ b/js/src/jit-test/tests/wasm/directives.txt
@@ -1 +1 @@
-|jit-test| test-also-wasm-baseline; include:wasm.js
+|jit-test| test-also-no-wasm-baseline; include:wasm.js
diff --git a/js/src/jit-test/tests/wasm/regress/directives.txt b/js/src/jit-test/tests/wasm/regress/directives.txt
index 8546e536a7b2..eab4d13e3746 100644
--- a/js/src/jit-test/tests/wasm/regress/directives.txt
+++ b/js/src/jit-test/tests/wasm/regress/directives.txt
@@ -1 +1 @@
-|jit-test| test-also-wasm-baseline; include:wasm.js
+|jit-test| test-also-no-wasm-baseline; include:wasm.js
diff --git a/js/src/jit-test/tests/wasm/spec/directives.txt b/js/src/jit-test/tests/wasm/spec/directives.txt
index cae0212f3628..09877b74a165 100644
--- a/js/src/jit-test/tests/wasm/spec/directives.txt
+++ b/js/src/jit-test/tests/wasm/spec/directives.txt
@@ -1 +1 @@
-|jit-test| test-also-wasm-baseline; include:wasm-testharness.js
+|jit-test| test-also-no-wasm-baseline; include:wasm-testharness.js
diff --git a/js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js b/js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js
index c5b92c1f8768..99453336ca95 100644
--- a/js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js
+++ b/js/src/jit-test/tests/wasm/timeout/debug-interrupt-1.js
@@ -2,7 +2,7 @@
 
 // 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();
diff --git a/js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js b/js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js
index 864ec6275038..e7c1350a3728 100644
--- a/js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js
+++ b/js/src/jit-test/tests/wasm/timeout/debug-interrupt-2.js
@@ -2,7 +2,7 @@
 
 // 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();
diff --git a/js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js b/js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js
index 0dcd38cc9a70..e42d278d4bca 100644
--- a/js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js
+++ b/js/src/jit-test/tests/wasm/timeout/debug-noprofiling.js
@@ -2,7 +2,7 @@
 
 // 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);
diff --git a/js/src/jit-test/tests/wasm/timeout/directives.txt b/js/src/jit-test/tests/wasm/timeout/directives.txt
index 8262f0bbae1f..1289a317072b 100644
--- 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