Bug 1084066 - plugins and extensions moved to wrong directory by mozharness. r=ted,a=sledru
authorPhilipp Kewisch <mozilla@kewis.ch>
Fri, 02 Jan 2015 22:35:48 +0100
changeset 243024 64fb35ee1af6
parent 243023 34330baf2af6
child 243025 2ab5add95717
push id4365
push usermozilla@kewis.ch
push date2015-01-24 23:29 +0000
treeherdermozilla-beta@64fb35ee1af6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, sledru
bugs1084066
milestone36.0
Bug 1084066 - plugins and extensions moved to wrong directory by mozharness. r=ted,a=sledru
testing/config/mozharness/mac_config.py
testing/xpcshell/runxpcshelltests.py
--- a/testing/config/mozharness/mac_config.py
+++ b/testing/config/mozharness/mac_config.py
@@ -34,11 +34,10 @@ config = {
         "tests/bin/js",
         "--no-slow",
         "--no-progress",
         "--tinderbox",
         "--tbpl"
     ],
     "mozbase_options": [
         "-b", "%(binary_path)s"
-    ],
-    "mac_res_subdir": "MacOS",
+    ]
 }
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -793,34 +793,34 @@ class XPCShellTests(object):
           Set the absolute path for xpcshell, httpdjspath and xrepath.
           These 3 variables depend on input from the command line and we need to allow for absolute paths.
           This function is overloaded for a remote solution as os.path* won't work remotely.
         """
         self.testharnessdir = os.path.dirname(os.path.abspath(__file__))
         self.headJSPath = self.testharnessdir.replace("\\", "/") + "/head.js"
         self.xpcshell = os.path.abspath(self.xpcshell)
 
-        # we assume that httpd.js lives in components/ relative to xpcshell
-        self.httpdJSPath = os.path.join(os.path.dirname(self.xpcshell), 'components', 'httpd.js')
-        self.httpdJSPath = self.httpdJSPath.replace('\\', '/')
-
-        self.httpdManifest = os.path.join(os.path.dirname(self.xpcshell), 'components', 'httpd.manifest')
-        self.httpdManifest = self.httpdManifest.replace('\\', '/')
-
         if self.xrePath is None:
             self.xrePath = os.path.dirname(self.xpcshell)
             if mozinfo.isMac:
                 # Check if we're run from an OSX app bundle and override
                 # self.xrePath if we are.
                 appBundlePath = os.path.join(os.path.dirname(os.path.dirname(self.xpcshell)), 'Resources')
                 if os.path.exists(os.path.join(appBundlePath, 'application.ini')):
                     self.xrePath = appBundlePath
         else:
             self.xrePath = os.path.abspath(self.xrePath)
 
+        # httpd.js belongs in xrePath/components, which is Contents/Resources on mac
+        self.httpdJSPath = os.path.join(self.xrePath, 'components', 'httpd.js')
+        self.httpdJSPath = self.httpdJSPath.replace('\\', '/')
+
+        self.httpdManifest = os.path.join(self.xrePath, 'components', 'httpd.manifest')
+        self.httpdManifest = self.httpdManifest.replace('\\', '/')
+
         if self.mozInfo is None:
             self.mozInfo = os.path.join(self.testharnessdir, "mozinfo.json")
 
     def buildCoreEnvironment(self):
         """
           Add environment variables likely to be used across all platforms, including remote systems.
         """
         # Make assertions fatal