Bug 1496297 - Use |jit-test| skip-if as appropriate in jit-test/tests/modules/ (r=jorendorff)
authorEric Faust <efausbmo@gmail.com>
Tue, 09 Oct 2018 15:41:50 -0700
changeset 498845 4da5afa3f427920eac6fc9d3de57c5fee80636af
parent 498844 178e8e65a1a3874bb7215043af0ba12df06120a8
child 498846 222b9bd838ecc373b3e09442ca285ebca215ef2c
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs1496297
milestone64.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 1496297 - Use |jit-test| skip-if as appropriate in jit-test/tests/modules/ (r=jorendorff)
js/src/jit-test/tests/modules/bug-1219044.js
js/src/jit-test/tests/modules/bug-1372258.js
js/src/jit-test/tests/modules/bug-1402535.js
js/src/jit-test/tests/modules/bug-1402649.js
js/src/jit-test/tests/modules/bug-1420420-3.js
js/src/jit-test/tests/modules/bug-1435327.js
js/src/jit-test/tests/modules/bug-1466487.js
js/src/jit-test/tests/modules/eval-module-oom.js
js/src/jit-test/tests/modules/import-meta-oom.js
js/src/jit-test/tests/modules/missing-export-offthread.js
js/src/jit-test/tests/modules/off-thread-compile.js
--- a/js/src/jit-test/tests/modules/bug-1219044.js
+++ b/js/src/jit-test/tests/modules/bug-1219044.js
@@ -1,5 +1,4 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 oomTest(() => parseModule('import v from "mod";'));
 fullcompartmentchecks(true);
--- a/js/src/jit-test/tests/modules/bug-1372258.js
+++ b/js/src/jit-test/tests/modules/bug-1372258.js
@@ -1,10 +1,9 @@
-if (helperThreadCount() == 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
 
 // Overwrite built-in parseModule with off-thread module parser.
 function parseModule(source) {
     offThreadCompileModule(source);
     return finishOffThreadModule();
 }
 
 // Test case derived from: js/src/jit-test/tests/modules/many-imports.js
--- a/js/src/jit-test/tests/modules/bug-1402535.js
+++ b/js/src/jit-test/tests/modules/bug-1402535.js
@@ -1,7 +1,6 @@
-if (!('stackTest' in this))
-   quit();
+// |jit-test| skip-if: !('stackTest' in this)
 
 stackTest(function() {
     let m = parseModule(``);
     m.declarationInstantiation();
 });
--- a/js/src/jit-test/tests/modules/bug-1402649.js
+++ b/js/src/jit-test/tests/modules/bug-1402649.js
@@ -1,10 +1,9 @@
-if (!('oomTest' in this))
-   quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 loadFile(`
 function parseAndEvaluate(source) {
     let m = parseModule(source);
     m.declarationInstantiation();
 }
 parseAndEvaluate("async function a() { await 2 + 3; }")
 `);
--- a/js/src/jit-test/tests/modules/bug-1420420-3.js
+++ b/js/src/jit-test/tests/modules/bug-1420420-3.js
@@ -1,8 +1,7 @@
-if (!('stackTest' in this))
-   quit();
+// |jit-test| skip-if: !('stackTest' in this)
 
 let a = parseModule(`throw new Error`);
 a.declarationInstantiation();
 stackTest(function() {
     a.evaluation();
 });
--- a/js/src/jit-test/tests/modules/bug-1435327.js
+++ b/js/src/jit-test/tests/modules/bug-1435327.js
@@ -1,10 +1,9 @@
-if (!('oomTest' in this))
-    quit();
+// |jit-test| skip-if: !('oomTest' in this)
 
 lfLogBuffer = `
   let moduleRepo = {};
   setModuleResolveHook(function(x, specifier) {
         return moduleRepo[specifier];
   });
   let c = moduleRepo['c'] = parseModule("");
   let d = moduleRepo['d'] = parseModule("import { a } from 'c'; a;");
--- a/js/src/jit-test/tests/modules/bug-1466487.js
+++ b/js/src/jit-test/tests/modules/bug-1466487.js
@@ -1,7 +1,7 @@
-if (helperThreadCount() === 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
+
 evalInWorker(`
     let m = parseModule("import.meta;");
     m.declarationInstantiation();
     m.evaluation();
 `);
--- a/js/src/jit-test/tests/modules/eval-module-oom.js
+++ b/js/src/jit-test/tests/modules/eval-module-oom.js
@@ -1,12 +1,11 @@
-// OOM tests for module parsing.
+// |jit-test| skip-if: !('oomTest' in this)
 
-if (!('oomTest' in this))
-    quit();
+// OOM tests for module parsing.
 
 load(libdir + "dummyModuleResolveHook.js");
 
 const sa =
 `export default 20;
  export let a = 22;
  export function f(x, y) { return x + y }
 `;
--- a/js/src/jit-test/tests/modules/import-meta-oom.js
+++ b/js/src/jit-test/tests/modules/import-meta-oom.js
@@ -1,6 +1,3 @@
-// |jit-test| module
-
-if (typeof oomTest !== "function")
-    quit();
+// |jit-test| module; skip-if: !('oomTest' in this)
 
 oomTest(() => import.meta);
--- a/js/src/jit-test/tests/modules/missing-export-offthread.js
+++ b/js/src/jit-test/tests/modules/missing-export-offthread.js
@@ -1,8 +1,7 @@
-if (helperThreadCount() == 0)
-    quit();
+// |jit-test| skip-if: helperThreadCount() === 0
 
 load(libdir + "asserts.js")
 
 // Don't assert.
 offThreadCompileModule("export { x };");
 assertThrowsInstanceOf(() => finishOffThreadModule(), SyntaxError);
--- a/js/src/jit-test/tests/modules/off-thread-compile.js
+++ b/js/src/jit-test/tests/modules/off-thread-compile.js
@@ -1,12 +1,11 @@
-// Test off thread module compilation.
+// |jit-test| skip-if: helperThreadCount() === 0
 
-if (helperThreadCount() == 0)
-    quit();
+// Test off thread module compilation.
 
 load(libdir + "asserts.js");
 load(libdir + "dummyModuleResolveHook.js");
 
 function offThreadParseAndEvaluate(source) {
     offThreadCompileModule(source);
     let m = finishOffThreadModule();
     m.declarationInstantiation();