Bug 1040823: Simplify tests from bug 986673; r=tests-only

js/src/jit-test/tests/asm.js/testTimeout-deactivate-reactivate-signals.js

@@ -10,10 +10,11 @@ if (jco["signals.enable"] === 0 || !isCachingEnabled() || !isAsmJSCompilationAva
 // handlers have been reactivated.
 setJitCompilerOption("signals.enable", 0);
 
-var code = USE_ASM + "/* deactivate-reactivate-signals */ function f() {} function g() { while(1) { f() } } return g";
+var code = USE_ASM + "function f() {} function g() { while(1) { f() } } return g";
 
 var m = asmCompile(code);
 assertEq(isAsmJSModule(m), true);
+assertEq(isAsmJSModuleLoadedFromCache(m), false);
 
 setJitCompilerOption("signals.enable", 1);
 

js/src/jit-test/tests/asm.js/testTimeout1-nosignals.js

@@ -3,7 +3,7 @@
 load(libdir + "asm.js");
 
 setJitCompilerOption("signals.enable", 0);
-var g = asmLink(asmCompile(USE_ASM + "/* no-signals */ function f() {} function g() { while(1) { f() } } return g"));
+var g = asmLink(asmCompile(USE_ASM + "function f() {} function g() { while(1) { f() } } return g"));
 timeout(1);
 g();
 assertEq(true, false);

js/src/jit-test/tests/asm.js/testTimeout2-nosignals.js

@@ -3,7 +3,7 @@
 load(libdir + "asm.js");
 
 setJitCompilerOption("signals.enable", 0);
-var g = asmLink(asmCompile(USE_ASM + "/* no-signals */ function g() { while(1) {} } return g"));
+var g = asmLink(asmCompile(USE_ASM + "function g() { while(1) {} } return g"));
 timeout(1);
 g();
 assertEq(true, false);

js/src/jit-test/tests/asm.js/testTimeout3-nosignals.js

@@ -3,7 +3,7 @@
 load(libdir + "asm.js");
 
 setJitCompilerOption("signals.enable", 0);
-var f = asmLink(asmCompile(USE_ASM + "/* no-signals */ function f(i) { i=i|0; if (!i) return; f((i-1)|0); f((i-1)|0); f((i-1)|0); f((i-1)|0); f((i-1)|0); } return f"));
+var f = asmLink(asmCompile(USE_ASM + "function f(i) { i=i|0; if (!i) return; f((i-1)|0); f((i-1)|0); f((i-1)|0); f((i-1)|0); f((i-1)|0); } return f"));
 timeout(1);
 f(100);
 assertEq(true, false);

js/src/jit-test/tests/asm.js/testTimeout4-nosignals.js

@@ -3,7 +3,7 @@
 load(libdir + "asm.js");
 
 setJitCompilerOption("signals.enable", 0);
-var g = asmLink(asmCompile(USE_ASM + "/* no-signals */ function f(d) { d=+d; d=d*.1; d=d/.4; return +d } function g() { while(1) { +f(1.1) } } return g"));
+var g = asmLink(asmCompile(USE_ASM + "function f(d) { d=+d; d=d*.1; d=d/.4; return +d } function g() { while(1) { +f(1.1) } } return g"));
 timeout(1);
 g();
 assertEq(true, false);