Bug 1620998 - Fix XPCShell tests that need to run the crash helper r=afranchuk,geckoview-reviewers,application-update-reviewers,nalexander,owlish

Differential Revision: https://phabricator.services.mozilla.com/D231525

Author: gabrielesvelto

mobile/shared/modules/geckoview/test/xpcshell/test_ChildCrashHandler.js

@@ -14,8 +14,8 @@ const { makeFakeAppDir } = ChromeUtils.importESModule(
 
 add_setup(async function () {
   await makeFakeAppDir();
-  // The test harness sets MOZ_CRASHREPORTER_NO_REPORT, which disables crash
-  // reports. This test needs them enabled.
+  // The test harness sets MOZ_CRASHREPORTER_NO_REPORT, which disables
+  // reporting crashes to the user. This test needs them enabled.
   const noReport = Services.env.get("MOZ_CRASHREPORTER_NO_REPORT");
   Services.env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
 

netwerk/test/unit/test_socks.js

@@ -43,7 +43,19 @@ function runScriptSubprocess(script, args) {
 
   var file = do_get_file(script);
   var proc = new Process(bin);
-  var procArgs = [file.path].concat(args);
+  var procArgs = [];
+
+  if (AppConstants.platform != "macosx") {
+    var grebind = ds.get("GreBinD", Ci.nsIFile);
+    if (!grebind.exists()) {
+      do_throw("Could not find binary dir");
+    }
+
+    procArgs.push("-g", grebind.path);
+  }
+
+  procArgs.push(file.path);
+  procArgs = procArgs.concat(args);
 
   proc.run(false, procArgs, procArgs.length);
 

testing/mozbase/mozcrash/mozcrash/mozcrash.py

@@ -818,7 +818,7 @@ def cleanup_pending_crash_reports():
         )
     elif mozinfo.isMac:
         location = os.path.expanduser(
-            "~/Library/Application Support/firefox/Crash Reports"
+            "~/Library/Application Support/Firefox/Crash Reports"
         )
     else:
         location = os.path.expanduser("~/.mozilla/firefox/Crash Reports")

testing/xpcshell/runxpcshelltests.py

@@ -975,6 +975,7 @@ def run_test(self):
                 return_code_ok
                 and self.usingCrashReporter
                 and not self.saw_crash_reporter_init
+                and len(process_output) > 0
             )
 
             passed = (

testing/xpcshell/selftest.py

@@ -12,11 +12,11 @@
 import os
 import pprint
 import re
-import shutil
 import sys
 import tempfile
 import unittest
 
+import mozfile
 import mozinfo
 import six
 from mozlog import structured
@@ -485,7 +485,7 @@ def setUp(self):
         self.x.harness_timeout = 30 if not mozinfo.info["ccov"] else 60
 
     def tearDown(self):
-        shutil.rmtree(self.tempdir)
+        mozfile.remove(self.tempdir)
         self.x.shutdownNode()
 
     def writeFile(self, name, contents, mode="w"):

toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js

@@ -7,9 +7,6 @@
  * "Couldn't get the user appdata directory. Crash events may not be produced."
  * in nsExceptionHandler.cpp (possibly bug 619104)
  *
- * Test log warnings that happen after the test has finished
- * "OOPDeinit() without successful OOPInit()" in nsExceptionHandler.cpp
- * (bug 619104)
  * "XPCOM objects created/destroyed from static ctor/dtor" in nsTraceRefcnt.cpp
  * (possibly bug 457479)
  *

toolkit/xre/test/test_install_hash.js

@@ -15,16 +15,18 @@ const XRE = Cc["@mozilla.org/xre/directory-provider;1"].getService(
 );
 const HASH = XRE.getInstallHash(false);
 const EXE = Services.dirsvc.get("XREExeF", Ci.nsIFile);
+const GREBIND = Services.dirsvc.get("GreBinD", Ci.nsIFile);
 const SCRIPT = do_get_file("show_hash.js", false);
 
 async function getHash(bin) {
   try {
     // If this test is running through firefox.exe -xpcshell, we need
     // to make sure to execute the script through it as well.
     let args = [];
-    if (!bin.leafName.startsWith("xpcshell")) {
+    if (!bin.leafName.toLowerCase().startsWith("xpcshell")) {
       args.push("-xpcshell");
     }
+    args.push("-g", GREBIND.path);
     args.push(SCRIPT.path);
 
     let proc = await Subprocess.call({