Remove MOZ_CRASHREPORTER_NO_REPORT except in /testing

2018-03-30 12:07:42 +02:00
1 parent 4e368f8199
commit 4e721d14cd
@@ -228,10 +228,7 @@ class Automation(object):
    if dmdPath and dmdLibrary and preloadEnvVar:
      env[preloadEnvVar] = os.path.join(dmdPath, dmdLibrary)

-    if crashreporter and not debugger:
-      env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
-    else:
-      env['MOZ_CRASHREPORTER_DISABLE'] = '1'
+    env['MOZ_CRASHREPORTER_DISABLE'] = '1'

    # Crash on non-local network connections by default.
    # MOZ_DISABLE_NONLOCAL_CONNECTIONS can be set to "0" to temporarily
@@ -156,9 +156,6 @@ class B2GRemoteAutomation(Automation):
        if env is None:
            env = {}

-        if crashreporter:
-            env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
-
        # We always hide the results table in B2G; it's much slower if we don't.
        env['MOZ_HIDE_RESULTS_TABLE'] = '1'
        return env
@@ -74,10 +74,7 @@ class RemoteAutomation(Automation):
        if 'MOZ_HIDE_RESULTS_TABLE' in os.environ:
            env['MOZ_HIDE_RESULTS_TABLE'] = os.environ['MOZ_HIDE_RESULTS_TABLE']

-        if crashreporter and not debugger:
-            env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
-        else:
-            env['MOZ_CRASHREPORTER_DISABLE'] = '1'
+        env['MOZ_CRASHREPORTER_DISABLE'] = '1'

        # Crash on non-local network connections by default.
        # MOZ_DISABLE_NONLOCAL_CONNECTIONS can be set to "0" to temporarily
@@ -53,7 +53,6 @@ if __name__ == '__main__':
                             locations=locations)

    env = os.environ.copy()
-    env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
    env["XPCOM_DEBUG_BREAK"] = "warn"

    # For VC12+, make sure we can find the right bitness of pgort1x0.dll
@@ -90,7 +90,6 @@ class MachCommands(MachCommandBase):
            env = os.environ.copy()
            env['G_SLICE'] = 'always-malloc'
            env['MOZ_CC_RUN_DURING_SHUTDOWN'] = '1'
-            env['MOZ_CRASHREPORTER_NO_REPORT'] = '1'
            env['XPCOM_DEBUG_BREAK'] = 'warn'

            env.update(self.extra_environment_variables)
@@ -83,21 +83,10 @@ function onPluginCrashed(aEvent) {
           getService(Components.interfaces.nsIObserverService);
  os.removeObserver(testObserver, "plugin-crashed");

-  // re-set MOZ_CRASHREPORTER_NO_REPORT
-  let env = Components.classes["@mozilla.org/process/environment;1"]
-                      .getService(Components.interfaces.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
  SimpleTest.finish();
 }

 function runTests() {
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Components.classes["@mozilla.org/process/environment;1"]
-                      .getService(Components.interfaces.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
  var os = Components.classes["@mozilla.org/observer-service;1"].
           getService(Components.interfaces.nsIObserverService);
  os.addObserver(testObserver, "plugin-crashed", true);
@@ -70,11 +70,6 @@ var testObserver = {
             getService(Components.interfaces.nsIObserverService);
    os.removeObserver(testObserver, "crash-report-status");

-    // Then re-set MOZ_CRASHREPORTER_NO_REPORT
-    let env = Components.classes["@mozilla.org/process/environment;1"]
-                        .getService(Components.interfaces.nsIEnvironment);
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-
    // Finally re-set crashreporter URL
    crashReporter.serverURL = oldServerURL;

@@ -123,13 +118,6 @@ function onPluginCrashed(aEvent) {
 }

 function runTests() {
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Components.classes["@mozilla.org/process/environment;1"]
-                      .getService(Components.interfaces.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
  // Override the crash reporter URL to send to our fake server
  crashReporter.serverURL = NetUtil.newURI(SERVER_URL);

@@ -78,10 +78,6 @@ var testObserver = {
    // Next unregister our observer
    Services.obs.removeObserver(testObserver, "crash-report-status");

-    // Then re-set MOZ_CRASHREPORTER_NO_REPORT
-    let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-
    // Finally re-set prefs
    crashReporter.serverURL = oldServerURL;
    Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", oldTimeoutPref);
@@ -133,13 +129,6 @@ function runTests() {
  // Default plugin hang timeout is too high for mochitests
  Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", 1);

-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Cc["@mozilla.org/process/environment;1"]
-                      .getService(Ci.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
  // Override the crash reporter URL to send to our fake server
  crashReporter.serverURL = NetUtil.newURI(SERVER_URL);

@@ -70,8 +70,6 @@ try {
 catch (e) { }

 // Enable crash reporting, if possible
-// We rely on the Python harness to set MOZ_CRASHREPORTER_NO_REPORT
-// and handle checking for minidumps.
 // Note that if we're in a child process, we don't want to init the
 // crashreporter component.
 try { // nsIXULRuntime is not available in some configurations.
@@ -32,7 +32,6 @@ fail() {
    exit 1
 }

-export MOZ_CRASHREPORTER_NO_REPORT=1
 export MOZ_OBJDIR=obj-firefox
 export TINDERBOX_OUTPUT=1

@@ -36,7 +36,6 @@ fail() {
    exit 1
 }

-export MOZ_CRASHREPORTER_NO_REPORT=1
 export MOZ_OBJDIR=obj-firefox
 export TINDERBOX_OUTPUT=1