Bug 572064 bustage fix on copy/paste error
☠☠ backed out by 651c255625ff ☠ ☠
authorLukas Blakk <lsblakk@mozilla.com>
Wed, 09 Mar 2011 15:26:00 -0800
changeset 3734 f5a75bbe8097a5bb5db95b24b0c9540dec02a807
parent 3733 e059958cfa1c94d921156ffb22bacbc149e76ab9
child 3735 c28b33113f596e1bee7293d92e25793343503df2
push id1
push userroot
push dateWed, 17 Dec 2014 00:18:48 +0000
bugs572064
Bug 572064 bustage fix on copy/paste error
mozilla-tests/tests_master.cfg
mozilla-tests/universal_master_sqlite.cfg
--- a/mozilla-tests/tests_master.cfg
+++ b/mozilla-tests/tests_master.cfg
@@ -41,17 +41,17 @@ for p in ACTIVE_PLATFORMS.keys():
     ACTIVE_PLATFORMS[p] = deepcopy(PLATFORMS[p])
 
 buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, BRANCHES[branch],
                                                 ACTIVE_PLATFORMS, SUITES,
                                                 BRANCH_UNITTEST_VARS['platforms'])
-    buildObjects = mergeBuildObjects(buildObjects, talosObjects)T_VARS['platforms'])
+    buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
 # We only want builders, status objects
 c['builders'].extend(buildObjects['builders'])
 c['status'].extend(buildObjects['status'])
--- a/mozilla-tests/universal_master_sqlite.cfg
+++ b/mozilla-tests/universal_master_sqlite.cfg
@@ -41,17 +41,17 @@ for p in ACTIVE_PLATFORMS.keys():
     ACTIVE_PLATFORMS[p] = deepcopy(PLATFORMS[p])
 
 buildObjects = {}
 
 for branch in ACTIVE_BRANCHES:
     talosObjects = generateTalosBranchObjects(branch, BRANCHES[branch],
                                                 ACTIVE_PLATFORMS, SUITES,
                                                 BRANCH_UNITTEST_VARS['platforms'])
-    buildObjects = mergeBuildObjects(buildObjects, talosObjects)T_VARS['platforms'])
+    buildObjects = mergeBuildObjects(buildObjects, talosObjects)
 
 for project in ACTIVE_PROJECTS:
     projectObjects = generateProjectObjects(project, PROJECTS[project], SLAVES)
     buildObjects = mergeBuildObjects(buildObjects, projectObjects)
 
 # We only want builders, status objects
 c['builders'].extend(buildObjects['builders'])
 c['status'].extend(buildObjects['status'])