Fix mjsunit oddities (new try).

test/mjsunit/mjsunit.js

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 186 matching lines @@
     }
   }
 
 
   function PrettyPrintArrayElement(value, index, array) {
     if (value === undefined && !(index in array)) return "";
     return PrettyPrint(value);
   }
 
 
+  function failWithMessage(message) {
+    throw new MjsUnitAssertionError(message);
+  }
+
+
   function fail(expectedText, found, name_opt) {
     var message = "Fail" + "ure";
     if (name_opt) {
       // Fix this when we ditch the old test runner.
       message += " (" + name_opt + ")";
     }
 
     message += ": expected <" + expectedText +
         "> found <" + PrettyPrint(found) + ">";
     throw new MjsUnitAssertionError(message);
@@ skipping 140 matching lines @@
       if (typeof code === 'function') {
         code();
       } else {
         eval(code);
       }
       threwException = false;
     } catch (e) {
       if (typeof type_opt === 'function') {
         assertInstanceof(e, type_opt);
       } else if (type_opt !== void 0) {
-        fail("invalid use of assertThrows, maybe you want assertThrowsEquals");
+        failWithMessage("invalid use of assertThrows, maybe you want assertThrowsEquals");
       }
       if (arguments.length >= 3) {
         assertEquals(e.type, cause_opt);
       }
       // Success.
       return;
     }
-    throw new MjsUnitAssertionError("Did not throw exception");
+    failWithMessage("Did not throw exception");
   };
 
 
   assertThrowsEquals = function assertThrowsEquals(fun, val) {
     try {
       fun();
     } catch(e) {
       assertEquals(val, e);
       return;
     }
-    throw new MjsUnitAssertionError("Did not throw exception");
+    failWithMessage("Did not throw exception");
   };
 
 
   assertInstanceof = function assertInstanceof(obj, type) {
     if (!(obj instanceof type)) {
       var actualTypeName = null;
       var actualConstructor = Object.getPrototypeOf(obj).constructor;
       if (typeof actualConstructor === "function") {
         actualTypeName = actualConstructor.name || String(actualConstructor);
       }
-      fail("Object <" + PrettyPrint(obj) + "> is not an instance of <" +
+      failWithmessage("Object <" + PrettyPrint(obj) + "> is not an instance of <" +
                (type.name || type) + ">" +
-               (actualTypeName ? " but of < " + actualTypeName + ">" : ""));
+               (actualTypeName ? " but of <" + actualTypeName + ">" : ""));
     }
   };
 
 
    assertDoesNotThrow = function assertDoesNotThrow(code, name_opt) {
     try {
       if (typeof code === 'function') {
         code();
       } else {
         eval(code);
       }
     } catch (e) {
-      fail("threw an exception: ", e.message || e, name_opt);
+      failWithMessage("threw an exception: " + (e.message || e));
     }
   };
 
   assertUnreachable = function assertUnreachable(name_opt) {
     // Fix this when we ditch the old test runner.
     var message = "Fail" + "ure: unreachable";
     if (name_opt) {
       message += " - " + name_opt;
     }
-    throw new MjsUnitAssertionError(message);
+    failWithMessage(message);
   };
 
   assertContains = function(sub, value, name_opt) {
     if (value == null ? (sub != null) : value.indexOf(sub) == -1) {
       fail("contains '" + String(sub) + "'", value, name_opt);
     }
   };
 
   assertMatches = function(regexp, str, name_opt) {
     if (!(regexp instanceof RegExp)) {
@@ skipping 22 matching lines @@
     if (sync_opt === undefined) sync_opt = "";
     assertTrue(OptimizationStatus(fun, sync_opt) !== 1, name_opt);
   }
 
   assertOptimized = function assertOptimized(fun, sync_opt, name_opt) {
     if (sync_opt === undefined) sync_opt = "";
     assertTrue(OptimizationStatus(fun, sync_opt) !== 2, name_opt);
   }
 
 })();