Fix bug 1117637 - plugins and extensions moved to wrong directory by buildbotcustom - use old res subdir for gecko < 34. r=catlee
authorPhilipp Kewisch <mozilla@kewis.ch>
Mon, 19 Jan 2015 18:03:09 +0100 (2015-01-19)
changeset 11693 998d8b9092785f180d9f2b30298a13c3728109d9
parent 11692 68dd550b2b23eb55facaaf5bae01a5bde86b5630
child 11694 8830cc5285d199eab498c4defc85585fa167f47c
push id8503
push usermozilla@kewis.ch
push dateWed, 21 Jan 2015 17:05:34 +0000 (2015-01-21)
reviewerscatlee
bugs1117637
Fix bug 1117637 - plugins and extensions moved to wrong directory by buildbotcustom - use old res subdir for gecko < 34. r=catlee
mozilla-tests/config.py
mozilla-tests/thunderbird_config.py
--- 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])