Backed out changeset 6cc5a05281c3 (bug 976863) for xpcshell failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 05 Mar 2014 15:36:26 -0500
changeset 189310 1ed55c9d92a856459dd0ca7b3142528e9083148c
parent 189309 ab9d624f94616190b07570198b8071e7405479f4
child 189311 9f57c9fd8d52e8b784e2e3fa3cdc3a1734f203f6
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs976863
milestone30.0a1
backs out6cc5a05281c35d02cc198d6056dda8f259893ff5
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
Backed out changeset 6cc5a05281c3 (bug 976863) for xpcshell failures. CLOSED TREE
toolkit/crashreporter/test/CrashTestUtils.jsm
--- a/toolkit/crashreporter/test/CrashTestUtils.jsm
+++ b/toolkit/crashreporter/test/CrashTestUtils.jsm
@@ -27,32 +27,17 @@ this.CrashTestUtils = {
 
 // Grab APIs from the testcrasher shared library
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/ctypes.jsm");
 let dir = Services.dirsvc.get("CurWorkD", Components.interfaces.nsILocalFile);
 let file = dir.clone();
 file.append(ctypes.libraryName("testcrasher"));
 let lib = ctypes.open(file.path);
-
-CrashTestUtils.crash = (crashType) => {
-  // CRASH_ABORT on Windows will bring up a dialog and hang until a user
-  // clicks a dialog. Tests are useless here. Detect that scenario and
-  // fail fast.
-  if (crashType == CrashTestUtils.CRASH_ABORT) {
-    if (Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).OS == "WINNT") {
-      throw new Error("CRASH_ABORT cannot be used on Windows because it " +
-                      "launches a dialog that requires user interaction.");
-    }
-  }
-
-  return CrashTestUtils._crash(crashType);
-};
-
-CrashTestUtils._crash = lib.declare("Crash",
+CrashTestUtils.crash = lib.declare("Crash",
                                    ctypes.default_abi,
                                    ctypes.void_t,
                                    ctypes.int16_t);
 CrashTestUtils.saveAppMemory = lib.declare("SaveAppMemory",
                                            ctypes.default_abi,
                                            ctypes.uint64_t);
 
 CrashTestUtils.lockDir = lib.declare("LockDir",