Bug 821590 - Use remote paths for MOZ_XRE_DIR and MOZILLA_FIVE_HOME in remote cpp unit tests; r=dmose
authorGeoff Brown <gbrown@mozilla.com>
Thu, 03 Jan 2013 13:01:59 -0700
changeset 117488 348e89acb5f3dc8bc5d4cb71d7ab2c903ea3b331
parent 117487 79e3ae50976460a55e57bd6ba56bef594bc0dc24
child 117489 386333461d424e5f1e5db7ee619f6c6143a5d1ef
push idunknown
push userunknown
push dateunknown
reviewersdmose
bugs821590
milestone20.0a1
Bug 821590 - Use remote paths for MOZ_XRE_DIR and MOZILLA_FIVE_HOME in remote cpp unit tests; r=dmose
testing/remotecppunittests.py
--- a/testing/remotecppunittests.py
+++ b/testing/remotecppunittests.py
@@ -61,16 +61,18 @@ class RemoteCPPUnitTests(cppunittests.CP
             remote_file = posixpath.join(self.remote_bin_dir, os.path.basename(local_file))
             self.device.pushFile(local_file, remote_file)
 
     def build_environment(self):
         env = self.build_core_environment()
         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
         return env
 
     def run_one_test(self, prog, env, symbols_path=None):
         """
         Run a single C++ unit test program remotely.
 
         Arguments:
         * prog: The path to the test program to run.