Bug 1403366 - Don't set MOZILLA_FIVE_HOME from multiple scripts. r=froydnj

It was seldom used before previous commit and now does nothing.

Author: glandium

build/automation.py.in

@@ -199,7 +199,6 @@ class Automation(object):
         envVar = "DYLD_LIBRARY_PATH"
         dmdLibrary = "libdmd.dylib"
       else: # unixish
-        env['MOZILLA_FIVE_HOME'] = xrePath
         dmdLibrary = "libdmd.so"
       if envVar in env:
         ldLibraryPath = ldLibraryPath + ":" + env[envVar]

build/unix/run-mozilla.sh

@@ -237,13 +237,8 @@ then
 	moz_bail "Cannot execute $MOZ_PROGRAM."
 fi
 #
-##
-## Set MOZILLA_FIVE_HOME
-##
-MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
-
 if [ -z "$MRE_HOME" ]; then
-    MRE_HOME=$MOZILLA_FIVE_HOME
+    MRE_HOME=$MOZ_DIST_BIN"
 fi
 ##
 ## Set LD_LIBRARY_PATH
@@ -315,7 +310,6 @@ export GNOME_DISABLE_CRASH_DIALOG
 
 if [ "$moz_debug" -eq 1 ]
 then
-  echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
   echo "  LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
   if [ -n "$LD_LIBRARYN32_PATH" ]
   then
@@ -349,7 +343,7 @@ then
   echo "moz_debugger_args=$moz_debugger_args"
 fi
 #
-export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
 export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
 
 if [ $moz_debug -eq 1 ]

testing/gtest/rungtests.py

@@ -81,7 +81,6 @@ def build_core_environment(self, env = {}):
         """
         Add environment variables likely to be used across all platforms, including remote systems.
         """
-        env["MOZILLA_FIVE_HOME"] = self.xre_path
         env["MOZ_XRE_DIR"] = self.xre_path
         env["MOZ_GMP_PATH"] = os.pathsep.join(
             os.path.join(self.xre_path, p, "1.0")

testing/mozbase/mozrunner/mozrunner/utils.py

@@ -104,7 +104,6 @@ def test_environment(xrePath, env=None, crashreporter=True, debugger=False,
     preloadEnvVar = None
     if mozinfo.isUnix:
         envVar = "LD_LIBRARY_PATH"
-        env['MOZILLA_FIVE_HOME'] = xrePath
         dmdLibrary = "libdmd.so"
         preloadEnvVar = "LD_PRELOAD"
     elif mozinfo.isMac:

testing/remotecppunittests.py

@@ -107,7 +107,6 @@ def build_environment(self):
         env['LD_LIBRARY_PATH'] = self.remote_bin_dir
         env["TMPDIR"] = self.remote_tmp_dir
         env["HOME"] = self.remote_home_dir
-        env["MOZILLA_FIVE_HOME"] = self.remote_home_dir
         env["MOZ_XRE_DIR"] = self.remote_bin_dir
         if self.options.add_env:
             for envdef in self.options.add_env:

testing/runcppunittests.py

@@ -84,7 +84,6 @@ def build_core_environment(self, env={}):
         """
         Add environment variables likely to be used across all platforms, including remote systems.
         """
-        env["MOZILLA_FIVE_HOME"] = self.xre_path
         env["MOZ_XRE_DIR"] = self.xre_path
         # TODO: switch this to just abort once all C++ unit tests have
         # been fixed to enable crash reporting