Update the mozilla tests to new version (as of 2010-06-29).

mozilla-tests/shell.js

 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
@@ skipping 57 matching lines @@
 var actual = '';
 var msg = '';
 
 var SECTION = "";
 var VERSION = "";
 var BUGNUMBER = "";
 
 /*
  * constant strings
  */
-var GLOBAL = "[object global]";
+var GLOBAL = this + '';
 var PASSED = " PASSED! ";
 var FAILED = " FAILED! ";
 
 var DEBUG = false;
 
 var DESCRIPTION;
 var EXPECTED;
 
 /*
  * wrapper for test case constructor that doesn't require the SECTION
@@ skipping 178 matching lines @@
     else
     {
       result += "\\x" + b + a;
     }
   }
 
   return result;
 }
 
 /*
+ * assertEq(actual, expected)
+ *           Throw if the two arguments are not ===
+ * see https://bugzilla.mozilla.org/show_bug.cgi?id=480199
+ */
+if (typeof assertEq == 'undefined')
+{
+  var assertEq =
+    function (actual, expected)
+    {
+      if (actual !== expected)
+      {
+        throw new TypeError('Assertion failed: got "' + actual + '", expected "' + expected);
+      }
+    };
+}
+
+/*
  * Compare expected result to actual result, if they differ (in value and/or
  * type) report a failure.  If description is provided, include it in the
  * failure report.
  */
 function reportCompare (expected, actual, description) {
   var expected_t = typeof expected;
   var actual_t = typeof actual;
   var output = "";
 
   if (typeof description == "undefined")
@@ skipping 382 matching lines @@
 
   for (optionName in optionsframe)
   {
     options(optionName);
   }
 
 }
 
 function optionsReset() {
 
-  optionsClear();
+  try
+  {
+    optionsClear();
 
-  // turn on initial settings
-  for (optionName in options.initvalues)
+    // turn on initial settings
+    for (optionName in options.initvalues)
+    {
+      options(optionName);
+    }
+  }
+  catch(ex)
   {
-    options(optionName);
+    print('optionsReset: caught ' + ex);
   }
+
 }
 
 if (typeof options == 'function')
 {
   optionsInit();
   optionsClear();
 }
 
 function getTestCaseResult(expected, actual)
 {
-  var expected_t = typeof expected;
-  var actual_t = typeof actual;
-  var passed = true;
- 
-  // because ( NaN == NaN ) always returns false, need to do
-  // a special compare to see if we got the right result.
-  if ( actual != actual ) 
-  {
-    if ( actual_t == "object" ) 
-    {
-      actual = "NaN object";
-    } 
-    else 
-    {
-      actual = "NaN number";
-    }
-  }
-  if ( expected != expected ) 
-  {
-    if ( expected_t == "object" ) 
-    {
-      expected = "NaN object";
-    } 
-    else 
-    {
-      expected = "NaN number";
-    }
-  }
+  if (typeof expected != typeof actual)
+    return false;
+  if (typeof expected != 'number')
+    // Note that many tests depend on the use of '==' here, not '==='.
+    return actual == expected;
 
-  if (expected_t != actual_t)
-  {
-    passed = false;
-  }
-  else if (expected != actual)
-  {
-    if (expected_t != 'number' || (Math.abs(actual - expected) > 1E-10))
-    {
-      passed = false;
-    }
-  }
- 
-  return passed;
+  // Distinguish NaN from other values.  Using x != x comparisons here
+  // works even if tests redefine isNaN.
+  if (actual != actual)
+    return expected != expected;
+  if (expected != expected)
+    return false;
+
+  // Tolerate a certain degree of error.
+  if (actual != expected)
+    return Math.abs(actual - expected) <= 1E-10;
+
+  // Here would be a good place to distinguish 0 and -0, if we wanted
+  // to.  However, doing so would introduce a number of failures in
+  // areas where they don't seem important.  For example, the WeekDay
+  // function in ECMA-262 returns -0 for Sundays before the epoch, but
+  // the Date functions in SpiderMonkey specified in terms of WeekDay
+  // often don't.  This seems unimportant.
+  return true;
 }
 
 if (typeof dump == 'undefined')
 {
   if (typeof window == 'undefined' &&
       typeof print == 'function')
   {
     dump = print;
   }
   else
@@ skipping 96 matching lines @@
     dump('jsTestDriverEnd ' + ex);
   }
 
   for (var i = 0; i < gTestcases.length; i++)
   {
     gTestcases[i].dump();
   }
 
 }
 
+function jit(on)
+{
+  if (on && !options().match(/jit/))
+  {
+    options('jit');
+  }
+  else if (!on && options().match(/jit/))
+  {
+    options('jit');
+  }
+}
+
 /*
  * Some tests need to know if we are in Rhino as opposed to SpiderMonkey
  */
 function inRhino()
 {
   return (typeof defineClass == "function");
 }
 
 /* these functions are useful for running tests manually in Rhino */
 
 function GetContext() {
   return Packages.com.netscape.javascript.Context.getCurrentContext();
 }
 function OptLevel( i ) {
   i = Number(i);
   var cx = GetContext();
   cx.setOptimizationLevel(i);
 }
 /* end of Rhino functions */