Fix
bug 1117637 - plugins and extensions moved to wrong directory by buildbotcustom - use old res subdir for gecko < 34. r=catlee
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -2249,16 +2249,21 @@ for name, branch in items_before(BRANCHE
# Disable Linux64-cc in every branch except try
for name in BRANCHES.keys():
if name in ('try',):
continue
for platform in ('linux64-cc',):
if platform in BRANCHES[name]['platforms']:
del BRANCHES[name]['platforms'][platform]
+# Mac OSX signing changes in gecko 34 - bug 1117637, bug 1047584
+for name, branch in items_before(BRANCHES, 'gecko_version', 34):
+ if 'macosx64' in BRANCHES[name]['platforms']:
+ BRANCHES[name]['platforms']['macosx64']['mac_res_subdir'] = 'MacOS'
+
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0:
items = dict([(b, BRANCHES[b]) for b in args])
--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -376,16 +376,21 @@ for platform in PLATFORMS.keys():
try:
branch['platforms'][platform][slave_platform][suite_type].remove(xpcshell)
if XPCSHELL_OLD not in branch['platforms'][platform][slave_platform][suite_type]:
branch['platforms'][platform][slave_platform][suite_type].append(XPCSHELL_OLD)
except ValueError:
# wasn't in the list anyways
pass
+# Mac OSX signing changes in gecko 34 - bug 1117637, bug 1047584
+for name, branch in items_before(BRANCHES, 'gecko_version', 34):
+ if 'macosx64' in BRANCHES[name]['platforms']:
+ BRANCHES[name]['platforms']['macosx64']['mac_res_subdir'] = 'MacOS'
+
if __name__ == "__main__":
import sys
import pprint
args = sys.argv[1:]
if len(args) > 0:
items = dict([(b, BRANCHES[b]) for b in args])