Fixing orange caused by fix for bug 572190. r=jst
authorBob Clary <bclary@bclary.com>
Wed, 21 Jul 2010 00:22:52 -0700
changeset 47999 584d7e1b6854015a5cbaff4b270e62395c3329b9
parent 47998 771c30fdfc567796b8eb05f1edee960571e54387
child 48000 1ac07fe5f6c912a0a2ae3882b5c477435adf6049
push id14528
push userjst@mozilla.com
push dateWed, 21 Jul 2010 07:24:43 +0000
treeherdermozilla-central@584d7e1b6854 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs572190
milestone2.0b3pre
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
Fixing orange caused by fix for bug 572190. r=jst
js/src/tests/js1_5/extensions/regress-336409-2.js
js/src/tests/js1_5/extensions/regress-336410-2.js
--- a/js/src/tests/js1_5/extensions/regress-336409-2.js
+++ b/js/src/tests/js1_5/extensions/regress-336409-2.js
@@ -35,17 +35,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 var gTestfile = 'regress-336409-2.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 336409;
 var summary = 'Integer overflow in js_obj_toSource';
 var actual = 'No Crash';
-var expect = 'No Crash';
+var expect = /(No Crash|InternalError: script stack space quota is exhausted|InternalError: allocation size overflow)/;
 
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
 expectExitCode(0);
 expectExitCode(5);
 
 function createString(n)
@@ -69,14 +69,13 @@ try
   printStatus('Creating object');
   var o = {f1: r, f2: r, f3: r,f4: r,f5: r, f6: r, f7: r, f8: r,f9: r};
   printStatus('object.toSource()');
   var rr = o.toSource();
   printStatus('Done.');
 }
 catch(ex)
 {
-  expect = 'InternalError: script stack space quota is exhausted';
   actual = ex + '';
   print(actual);
 }
 
-reportCompare(expect, actual, summary);
+reportMatch(expect, actual, summary);
--- a/js/src/tests/js1_5/extensions/regress-336410-2.js
+++ b/js/src/tests/js1_5/extensions/regress-336410-2.js
@@ -35,17 +35,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 var gTestfile = 'regress-336410-2.js';
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 336410;
 var summary = 'Integer overflow in array_toSource';
 var actual = 'No Crash';
-var expect = 'No Crash';
+var expect = /(No Crash|InternalError: script stack space quota is exhausted|InternalError: allocation size overflow)/;
 
 printBugNumber(BUGNUMBER);
 printStatus (summary);
 
 expectExitCode(0);
 expectExitCode(5);
 
 function createString(n)
@@ -69,14 +69,13 @@ try
   printStatus('Creating array');
   var o=[r, r, r, r, r, r, r, r, r];
   printStatus('object.toSource()');
   var rr = o.toSource();
   printStatus('Done.');
 }
 catch(ex)
 {
-  expect = 'InternalError: script stack space quota is exhausted';
   actual = ex + '';
   print(actual);
 }
 
-reportCompare(expect, actual, summary);
+reportMatch(expect, actual, summary);