corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1084066 - plugins and extensions moved to wrong directory by mozharness. r=ted

Browse Source
This commit is contained in:
Philipp Kewisch
2015-01-03 01:29:57 +01:00
parent fd6ae38880
commit 81674c159a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testing/config/mozharness/mac_config.py
View File

@@ -82,6 +82,5 @@ config = {
"run_filename": "runxpcshelltests.py",
"testsdir": "xpcshell"
}
},
"mac_res_subdir": "MacOS"
}
}

14
testing/xpcshell/runxpcshelltests.py
View File

@@ -804,13 +804,6 @@ class XPCShellTests(object):
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:
@@ -822,6 +815,13 @@ class XPCShellTests(object):
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")