Bug 1496297 - Use |jit-test| skip-if as appropriate in jit-test/tests/basic/ (r=jorendorff)

--HG--
extra : rebase_source : ba3a1186572935b06dedf780648d35f83f0cdb30

js/src/jit-test/tests/basic/bug-1198090.js

@@ -1,7 +1,4 @@
-// |jit-test| allow-oom
-
-if (!('oomAtAllocation' in this))
-    quit();
+// |jit-test| allow-oom; skip-if: !('oomAtAllocation' in this)
 
 for (let a of [
         null, function() {}, function() {}, null, function() {}, function() {},

js/src/jit-test/tests/basic/bug-1271507-2.js

@@ -1,4 +0,0 @@
-// |jit-test| allow-oom
-
-// Adapted from randomly chosen testcase: js/src/jit-test/tests/debug/bug-1238610.js
-load(libdir + "../tests/basic/bug-1271507.js");

js/src/jit-test/tests/basic/bug-1271507.js

@@ -1,7 +1,4 @@
-// |jit-test| allow-oom
-if (typeof oomAfterAllocations != "function")
-  quit();
-
+// |jit-test| allow-oom; skip-if: typeof oomAfterAllocations !== 'function'
 lfcode = new Array();
 oomAfterAllocations(100);
 loadFile(file);

js/src/jit-test/tests/basic/bug1207863.js

@@ -1,7 +1,4 @@
-// |jit-test| allow-oom; allow-unhandlable-oom
-
-if (!("oomAtAllocation" in this && "resetOOMFailure" in this))
-    quit();
+// |jit-test| allow-oom; allow-unhandlable-oom; skip-if: !("oomAtAllocation" in this && "resetOOMFailure" in this)
 
 function oomTest(f) {
     var i = 1;

js/src/jit-test/tests/basic/bug1234414.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-  quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 oomTest(() => {
     var max = 400;

js/src/jit-test/tests/basic/bug1240502.js

@@ -1,3 +1,2 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 oomTest(() => eval(`Array(..."ABC")`));

js/src/jit-test/tests/basic/bug1263868.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 function g(f, params) {
     entryPoints(params);
 }

js/src/jit-test/tests/basic/bug1264954.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 function f(x) {
     oomTest(() => eval(x));
 }

js/src/jit-test/tests/basic/bug1265693.js

@@ -1,4 +1,2 @@
-if (!('oomTest' in this))
-    quit();
-
+// |jit-test| skip-if: !('oomTest' in this)
 oomTest(Function("Function.hasOwnProperty(1.1)"));

js/src/jit-test/tests/basic/bug1278839.js

@@ -1,4 +1,3 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 for (var i=0; i<2; i++)
     oomTest(() => eval("setJitCompilerOption(eval + Function, 0);"));

js/src/jit-test/tests/basic/bug1285227.js

@@ -1,5 +1,4 @@
-if (helperThreadCount() === 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
 evalInWorker(`
     (new WeakMap).set(FakeDOMObject.prototype, this)
 `);

js/src/jit-test/tests/basic/bug1296016.js

@@ -1,4 +1,3 @@
-if (helperThreadCount() === 0)
-    quit(0);
+// |jit-test| skip-if: helperThreadCount() === 0
 offThreadCompileScript(``);
 evalInWorker(`runOffThreadScript()`);

js/src/jit-test/tests/basic/bug1296249.js

@@ -1,7 +1,4 @@
-// |jit-test| slow
-if (!('oomTest' in this))
-    quit();
-
+// |jit-test| slow; skip-if: !('oomTest' in this)
 function f(x) {
     new Int32Array(x);
 }

js/src/jit-test/tests/basic/bug1300904.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 Object.getOwnPropertyNames(this);
 oomTest(function() {
     this[0] = null;

js/src/jit-test/tests/basic/bug1341326.js

@@ -1,5 +1,4 @@
-if (helperThreadCount() == 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
 function eval(source) {
     offThreadCompileModule(source);
 }

js/src/jit-test/tests/basic/bug1344265.js

@@ -1,5 +1,3 @@
-// |jit-test| allow-unhandlable-oom; allow-oom
-if (!('oomAfterAllocations' in this))
-    quit();
+// |jit-test| allow-unhandlable-oom; allow-oom; skip-if: !('oomAfterAllocations' in this)
 oomAfterAllocations(1);
 newExternalString("a");

js/src/jit-test/tests/basic/bug1348407.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 x = evalcx("lazy");
 oomTest(function () {
     x.eval("1");

js/src/jit-test/tests/basic/bug1355573.js

@@ -1,5 +1,4 @@
-if (getBuildConfiguration().debug === true)
-    quit(0);
+// |jit-test| skip-if: getBuildConfiguration().debug === true
 function f(){};
 Object.defineProperty(f, "name", {value: "a".repeat((1<<28)-1)});
 var ex = null;

js/src/jit-test/tests/basic/bug1411294.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 oomTest(function() {
   eval(`var clonebuffer = serialize("abc");
   clonebuffer.clonebuffer = "\

js/src/jit-test/tests/basic/bug1447996.js

@@ -1,5 +1,5 @@
-if (!('stackTest' in this))
-    quit();
+// |jit-test| skip-if: !('stackTest' in this)
+
 var x = 0;
 function f() {
     var s = "abcdef(((((((a|b)a|b)a|b)a|b)a|b)a|b)a|b)" + x;

js/src/jit-test/tests/basic/bug1459258.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 oomTest(function() {
     return [0, Math.PI, NaN, Infinity, true, false, Symbol(), Math.tan,
             Reflect, Proxy, print, assertEq, Array, String, Boolean, Number, parseInt,

js/src/jit-test/tests/basic/bug1470732.js

@@ -1,6 +1,4 @@
-if (helperThreadCount() === 0)
-    quit();
-
+// |jit-test| skip-if: helperThreadCount() === 0
 var i = 0;
 while(i++ < 500) {
   evalInWorker(`

js/src/jit-test/tests/basic/dumpStringRepresentation.js

@@ -1,9 +1,8 @@
+// |jit-test| skip-if: typeof dumpStringRepresentation !== 'function'
+
 // Try the dumpStringRepresentation shell function on various types of
 // strings, and make sure it doesn't crash.
 
-if (typeof dumpStringRepresentation !== 'function')
-  quit(0);
-
 print("Empty string:");
 dumpStringRepresentation("");
 

js/src/jit-test/tests/basic/evalInWorker-interrupt.js

@@ -1,3 +1,2 @@
-if (helperThreadCount() === 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
 evalInWorker("setInterruptCallback(function() {}); timeout(1000);");

js/src/jit-test/tests/basic/evalInWorker-jit-options.js

@@ -1,5 +1,4 @@
-if (helperThreadCount() === 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
 var fun = function() {
     var ex;
     try {

js/src/jit-test/tests/basic/evaluate-worker.js

@@ -1,7 +1,4 @@
-// |jit-test| slow
-
-if (typeof evalInWorker == "undefined")
-    quit();
+// |jit-test| slow; skip-if: typeof evalInWorker === 'undefined'
 
 gcslice(11);
 evalInWorker("print('helo world');");

js/src/jit-test/tests/basic/inflate-oom.js

@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 function test() {
     function foo() {
         return 1;

js/src/jit-test/tests/basic/offThreadCompileScript-01.js

@@ -1,3 +1,5 @@
+// |jit-test| skip-if: helperThreadCount() === 0
+
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
@@ -5,9 +7,6 @@
 
 load(libdir + 'asserts.js');
 
-if (helperThreadCount() === 0)
-  quit(0);
-
 offThreadCompileScript('Math.sin(Math.PI/2)');
 assertEq(runOffThreadScript(), 1);
 

js/src/jit-test/tests/basic/offThreadCompileScript-02.js

@@ -1,7 +1,6 @@
-// Test offThreadCompileScript option handling.
+// |jit-test| skip-if: helperThreadCount() === 0
 
-if (helperThreadCount() === 0)
-  quit(0);
+// Test offThreadCompileScript option handling.
 
 offThreadCompileScript('Error()');
 assertEq(!!runOffThreadScript().stack.match(/^@<string>:1:1\n/), true);

js/src/jit-test/tests/basic/testApplyArrayInline.js

@@ -1,12 +1,11 @@
+// |jit-test| skip-if: !this.getJitCompilerOptions() || !getJitCompilerOptions()['ion.enable']
+
 // Test inlining in Ion of fun.apply(..., array).
 
 setJitCompilerOption("ion.warmup.trigger", 50);
 setJitCompilerOption("offthread-compilation.enable", 0);
 gcPreserveCode();
 
-if (!this.getJitCompilerOptions() || !getJitCompilerOptions()['ion.enable'])
-    quit(0);
-
 var itercount = 1000;
 var warmup = 100;
 

js/src/jit-test/tests/basic/testBug756919.js

@@ -1,6 +1,4 @@
-if (!('oomTest' in this))
-    quit();
-
+// |jit-test| skip-if: !('oomTest' in this)
 function test(x) {
     var upvar = "";
     function f() { upvar += ""; }

js/src/jit-test/tests/basic/testOOMInAutoEnterCompartment.js

@@ -1,6 +1,5 @@
-// |jit-test| slow
-// This test is too slow to run with ASan in a debug configuration
-if (getBuildConfiguration()['asan'] && getBuildConfiguration()['debug']) quit(0);
+// |jit-test| slow; skip-if: (getBuildConfiguration()['asan'] && getBuildConfiguration()['debug'])
+// This test is too slow to run at all with ASan in a debug configuration
 
 function fatty() {
     try {

js/src/jit-test/tests/basic/withSourceHook.js

@@ -1,13 +1,10 @@
+// |jit-test| skip-if: typeof withSourceHook !== 'function'
+
 // Check that withSourceHook passes URLs, propagates exceptions, and
 // properly restores the original source hooks.
 
 load(libdir + 'asserts.js');
 
-// withSourceHook isn't defined if you pass the shell the --fuzzing-safe
-// option. Skip this test silently, to avoid spurious failures.
-if (typeof withSourceHook != 'function')
-  quit(0);
-
 var log = '';
 
 // Establish an outermost source hook.