Remove MOZ_CRASHREPORTER_NO_REPORT except in /testing

5 files changed, 2 insertions, 13 deletions

diff --git a/build/automation.py.in b/build/automation.py.in
index 83e718037..09c9d0071 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -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
diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py
index e547bd6d2..a21809068 100644
--- a/build/mobile/b2gautomation.py
+++ b/build/mobile/b2gautomation.py
@@ -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
diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py
index 26eedc85d..f098d5bba 100644
--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -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
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
index 3e5a870c3..adc93d9b1 100644
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -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
diff --git a/build/valgrind/mach_commands.py b/build/valgrind/mach_commands.py
index ba2575247..8109f0784 100644
--- a/build/valgrind/mach_commands.py
+++ b/build/valgrind/mach_commands.py
@@ -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)