Bug 1032787 - [tps] FirefoxRunner should not reset environment variables. r=aeftimie a=testonly DONTBUILD

testing/tps/tps/testrunner.py

@@ -46,7 +46,7 @@ class TempFile(object):
 
 class TPSTestRunner(object):
 
-    default_env = {
+    extra_env = {
         'MOZ_CRASHREPORTER_DISABLE': '1',
         'GNOME_DISABLE_CRASH_DIALOG': '1',
         'XRE_NO_WINDOWS_CRASH_DIALOG': '1',
@@ -351,9 +351,11 @@ class TPSTestRunner(object):
         if os.access(self.logfile, os.F_OK):
             os.remove(self.logfile)
 
-        # Make a copy of the default env variables and preferences, and update
-        # them for custom settings
-        self.env = self.default_env.copy()
+        # Copy the system env variables, and update them for custom settings
+        self.env = os.environ.copy()
+        self.env.update(self.extra_env)
+
+        # Update preferences for custom settings
         self.update_preferences()
 
         # Acquire a lock to make sure no other threads are running tests