Change mjsunit tests to work with and without the i18n extension

BUG=v8:2745
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/18187006

Patch from Jochen Eisinger <jochen@chromium.org>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15479 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/mjsunit/date.js b/test/mjsunit/date.js
index 5aaa3bb..a1b7871 100644 (file)
--- a/test/mjsunit/date.js
+++ b/test/mjsunit/date.js
@@ -150,7 +150,7 @@ assertTrue(isNaN(l.getUTCMilliseconds()));
 // date without the timezone information.
 function testToLocaleTimeString() {
   var d = new Date();
-  var s = d.toLocaleTimeString();
+  var s = d.toLocaleTimeString("en-GB");
   assertEquals(8, s.length);
 }
 
@@ -340,4 +340,4 @@ date.getYear();
 %OptimizeFunctionOnNextCall(Date.prototype.getYear);
 assertThrows(function() { Date.prototype.getYear.call(""); }, TypeError);
 opt_status = %GetOptimizationStatus(Date.prototype.getYear);
-assertTrue(%GetOptimizationStatus(Date.prototype.getTime) != 1);
\ No newline at end of file
+assertTrue(%GetOptimizationStatus(Date.prototype.getTime) != 1);

diff --git a/test/mjsunit/debug-script.js b/test/mjsunit/debug-script.js
index afaa369..c456e6b 100644 (file)
--- a/test/mjsunit/debug-script.js
+++ b/test/mjsunit/debug-script.js
@@ -61,9 +61,8 @@ for (i = 0; i < scripts.length; i++) {
 
 // This has to be updated if the number of native scripts change.
 assertEquals(16, named_native_count);
-// If no snapshot is used, only the 'gc' extension is loaded.
-// If snapshot is used, all extensions are cached in the snapshot.
-assertTrue(extension_count == 1 || extension_count == 5);
+// Only the 'gc' and (depending on flags) the 'i18n' extensions are loaded.
+assertTrue(extension_count == 1 || extension_count == 2);
 // This script and mjsunit.js has been loaded.  If using d8, d8 loads
 // a normal script during startup too.
 assertTrue(normal_count == 2 || normal_count == 3);

diff --git a/test/mjsunit/function-call.js b/test/mjsunit/function-call.js
index 92792ac..38be10c 100644 (file)
--- a/test/mjsunit/function-call.js
+++ b/test/mjsunit/function-call.js
@@ -151,6 +151,7 @@ var reducing_functions =
 
 function checkExpectedMessage(e) {
   assertTrue(e.message.indexOf("called on null or undefined") >= 0 ||
+             e.message.indexOf("invoked on undefined or null value") >= 0 ||
              e.message.indexOf("Cannot convert null to object") >= 0);
 }