From 8a3e5d92be0faebe29c4f1150f96ef543111b92d Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Mon, 21 Jul 2014 10:06:38 +0200
Subject: [PATCH] Bug 1040823: Simplify tests from bug 986673; r=tests-only

---
 .../tests/asm.js/testTimeout-deactivate-reactivate-signals.js  | 3 ++-
 js/src/jit-test/tests/asm.js/testTimeout1-nosignals.js         | 2 +-
 js/src/jit-test/tests/asm.js/testTimeout2-nosignals.js         | 2 +-
 js/src/jit-test/tests/asm.js/testTimeout3-nosignals.js         | 2 +-
 js/src/jit-test/tests/asm.js/testTimeout4-nosignals.js         | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/src/jit-test/tests/asm.js/testTimeout-deactivate-reactivate-signals.js b/js/src/jit-test/tests/asm.js/testTimeout-deactivate-reactivate-signals.js
index 4049d5733d4d..4240441609a1 100644
--- a/js/src/jit-test/tests/asm.js/testTimeout-deactivate-reactivate-signals.js
+++ b/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);
 
diff --git a/js/src/jit-test/tests/asm.js/testTimeout1-nosignals.js b/js/src/jit-test/tests/asm.js/testTimeout1-nosignals.js
index a3f74eee221f..6651842a19bd 100644
--- a/js/src/jit-test/tests/asm.js/testTimeout1-nosignals.js
+++ b/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);
diff --git a/js/src/jit-test/tests/asm.js/testTimeout2-nosignals.js b/js/src/jit-test/tests/asm.js/testTimeout2-nosignals.js
index bb1fbc9083e7..14c663cfeea6 100644
--- a/js/src/jit-test/tests/asm.js/testTimeout2-nosignals.js
+++ b/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);
diff --git a/js/src/jit-test/tests/asm.js/testTimeout3-nosignals.js b/js/src/jit-test/tests/asm.js/testTimeout3-nosignals.js
index fc70bea7be47..9bef132d6fbe 100644
--- a/js/src/jit-test/tests/asm.js/testTimeout3-nosignals.js
+++ b/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);
diff --git a/js/src/jit-test/tests/asm.js/testTimeout4-nosignals.js b/js/src/jit-test/tests/asm.js/testTimeout4-nosignals.js
index 14ecf0ca9a6c..052f16693a79 100644
--- a/js/src/jit-test/tests/asm.js/testTimeout4-nosignals.js
+++ b/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);