From 79dc058e8bc20e75ef5beddf1053719c4cf11ef0 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Fri, 29 Nov 2013 14:58:56 -0600
Subject: [PATCH] Bug 942276 - Improve test_asmjs2.html once caching is
 deterministic (r=me)

--HG--
extra : rebase_source : 36d1b607bda300f455d4086fe1bd8c7ca3834e77
---
 js/xpconnect/tests/mochitest/test_asmjs.html  | 2 +-
 js/xpconnect/tests/mochitest/test_asmjs2.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/xpconnect/tests/mochitest/test_asmjs.html b/js/xpconnect/tests/mochitest/test_asmjs.html
index 078451ca117..de0a4ce4e3e 100644
--- a/js/xpconnect/tests/mochitest/test_asmjs.html
+++ b/js/xpconnect/tests/mochitest/test_asmjs.html
@@ -17,7 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=854209
 
   <script>
   var jsFuns = SpecialPowers.Cu.getJSTestingFunctions();
-  ok(jsFuns.isAsmJSCompilationAvailable());
+  ok(jsFuns.isAsmJSCompilationAvailable(), "asm.js compilation is available");
   </script>
 
   <script src="http://mochi.test:8888/tests/js/xpconnect/tests/mochitest/file_asmjs.js"></script>
diff --git a/js/xpconnect/tests/mochitest/test_asmjs2.html b/js/xpconnect/tests/mochitest/test_asmjs2.html
index f2375f85e76..f9fc196b0ba 100644
--- a/js/xpconnect/tests/mochitest/test_asmjs2.html
+++ b/js/xpconnect/tests/mochitest/test_asmjs2.html
@@ -30,7 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=929236
   code += "var g42 = f();\n";
   code += "ok(jsFuns.isAsmJSFunction(g42), 'g42 is an asm.js function')\n";
   code += "ok(g42() === 42, 'g42 returns the correct result')\n";
-  code += "finishedEvalAsync();";
+  code += "finishedEvalAsync(f);";
   ok(code.length > 10000);
 
   function evalAsync(code) {
@@ -41,13 +41,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=929236
   }
 
   var state = 0;
-  function finishedEvalAsync() {
+  function finishedEvalAsync(module) {
     switch (state) {
       case 0:
         state++;
         evalAsync(code);
         break;
       case 1:
+        ok(jsFuns.isAsmJSModuleLoadedFromCache(module), 'module loaded from cache');
         SimpleTest.finish();
         break;
       default: