[JAEGER] Merge from tracemonkey. This picks up the test fix mentioned in the previous commit comment.
authorDavid Mandelin <dmandelin@mozilla.com>
Tue, 17 Aug 2010 15:33:07 -0700
changeset 53447 b32ec7fa1e2e552e8d513b57e54f0ae55ef82ae8
parent 53446 d98210dc7e0635cd8d8884a873d9b9c722ee8671 (current diff)
parent 51101 6bbe166b8b4024f3932a21307c73a26b2e81de03 (diff)
child 53448 6e5e2f31795bbfdb189e0c0a62cb47cc522d5d97
child 53449 c74dc777c5c69b6123855e5efe5a1146853e819f
push idunknown
push userunknown
push dateunknown
milestone2.0b4pre
[JAEGER] Merge from tracemonkey. This picks up the test fix mentioned in the previous commit comment.
--- a/js/src/trace-test/tests/basic/testReconstructImacroPCStack.js
+++ b/js/src/trace-test/tests/basic/testReconstructImacroPCStack.js
@@ -1,23 +1,28 @@
-var actual = "";
-var expect = "TypeError: x is not a function";
-
 x = Proxy.create((function () {
     return {
         get: function () {}
     }
 }()), Object.e)
 
+var hit = false;
+
 try {
     Function("\
       for(var a = 0; a < 2; ++a) {\
         if (a == 0) {}\
         else {\
           x > x\
         }\
       }\
     ")()
 } catch (e) {
-    actual = "" + e;
+    hit = true;
+
+    var str = String(e);
+    var match = (str == "TypeError: x is not a function" ||
+                 str == "TypeError: can't convert x to number");
+
+    assertEq(match, true);
 }
 
-assertEq(actual, expect);
+assertEq(hit, true);