Bug 1277562 - Part 5b: Adapt test cases. r=yury

--HG--
extra : rebase_source : 545315ea97844eed615e2dd6fd380f34d4d09623

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);
 

js/src/jit-test/tests/debug/bug1257045.js

@@ -1,4 +1,4 @@
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 fullcompartmentchecks(true);

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(`

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

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();

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";
+throw "TestComplete";

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())
+if (!wasmDebuggingIsSupported())
-     quit(3);
+    quit(3);
 
 var g = newGlobal();
 g.parent = this;

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(`

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;

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) ' +

js/src/jit-test/tests/debug/bug1351059.js

@@ -3,7 +3,7 @@
 
 load(libdir + "asserts.js");
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
   quit();
 
 var g = newGlobal();

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();

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();

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();

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();

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

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('');

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())
+if (!wasmDebuggingIsSupported())
-     quit(3);
+    quit(3);
 
 var g = newGlobal('');
 var dbg = new Debugger();

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())
+if (!wasmDebuggingIsSupported())
-     throw "TestComplete";
+    throw "TestComplete";
 
 function runWasmWithDebugger(wast, lib, init, done) {
     let g = newGlobal('');

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))',

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) {

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())
+if (!wasmDebuggingIsSupported())
-     quit();
+    quit();
 
 // Checking that there are no offsets are present in a wasm instance script for
 // which debug mode was not enabled.

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 = {};

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();

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();

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");

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();

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(

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(

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

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");

js/src/jit-test/tests/debug/wasm-onExceptionUnwind-gc.js

@@ -1,5 +1,5 @@
 
-if (!wasmIsSupported())
+if (!wasmDebuggingIsSupported())
     quit();
 
 var sandbox = newGlobal();

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");

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);
     }
 );
-

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

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

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

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

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();

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();

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);

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