merged from default

changeset: 2221:c3f31abf998a parent: 2219:7a4b00fe5f94 user: Ben Hearsum <bhearsum@mozilla.com> date: Wed Oct 05 14:43:18 2011 -0400 summary: bug 686578: SpiderMonkey builds on IonMonkey TBPL. r=catlee changeset: 2222:db0386e45a07 user: Ben Hearsum <bhearsum@mozilla.com> date: Wed Oct 05 14:48:17 2011 -0400 summary: bug 686578: SpiderMonkey builds on IonMonkey TBPL - copy environment before modifying it. r=catlee changeset: 2223:b84ee00f8c30 user: John Ford <jhford@mozilla.com> date: Wed Oct 05 14:04:09 2011 -0700 summary: bug 692258 - builds with PGO off are reporting to the PGO on branch in graphserver r=coop --HG-- branch : production-0.8
mozilla-releng · Oct 6, 2011 · 440170b · 440170b
2 parents 83a2f55 + 948ef24
commit 440170b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/misc.py b/misc.py
@@ -3180,6 +3180,9 @@ def generateSpiderMonkeyObjects(config, SLAVES):
             slaves = SLAVES[base_platform]
             interpreter = None
 
+        env = config['env'][platform].copy()
+        env['HG_REPO'] = config['hgurl'] + config['repo_path']
+
         for variant in variants:
             f = ScriptFactory(
                     config['scripts_repo'],
@@ -3197,7 +3200,7 @@ def generateSpiderMonkeyObjects(config, SLAVES):
                     'nextSlave': _nextSlowIdleSlave(config['idle_slaves']),
                     'factory': f,
                     'category': branch,
-                    'env': config['env'][platform],
+                    'env': env,
                     'properties': {'branch': branch},
                     }
             builders.append(builder)
@@ -3310,7 +3313,7 @@ def generateProjectObjects(project, config, SLAVES):
             }
 
     # Fuzzing
-    if project == 'fuzzing':
+    if project.startswith('fuzzing'):
         fuzzingObjects = generateFuzzingObjects(config, SLAVES)
         buildObjects = mergeBuildObjects(buildObjects, fuzzingObjects)
 
@@ -3320,17 +3323,17 @@ def generateProjectObjects(project, config, SLAVES):
         buildObjects = mergeBuildObjects(buildObjects, nanojitObjects)
 
     # Valgrind
-    elif project == 'valgrind':
+    elif project.startswith('valgrind'):
         valgrindObjects = generateValgrindObjects(config, SLAVES)
         buildObjects = mergeBuildObjects(buildObjects, valgrindObjects)
 
     # Jetpack
-    elif project == 'jetpack':
+    elif project.startswith('jetpack'):
         jetpackObjects = generateJetpackObjects(config, SLAVES)
         buildObjects = mergeBuildObjects(buildObjects, jetpackObjects)
 
     # Spidermonkey
-    elif project == 'spidermonkey':
+    elif project.startswith('spidermonkey'):
         spiderMonkeyObjects = generateSpiderMonkeyObjects(config, SLAVES)
         buildObjects = mergeBuildObjects(buildObjects, spiderMonkeyObjects)