Bug 1106707 - Pass through the platform and the tooltool server urls, r=bhearsum
authorSteve Fink <sfink@mozilla.com>
Tue, 09 Dec 2014 15:18:01 -0800
changeset 4048 ef812b5bdee9c662eb15559bdf033e47bcee795a
parent 4047 2b02c9c12a9c4d4c4fafdfca58772a1dc45a24ad
child 4049 11ce88ae52c3f7226ed9070e47aec379129414d1
child 4051 e5ba4d00f5d55672f5f5964780e94d3f753732c8
push id3353
push usersfink@mozilla.com
push dateFri, 16 Jan 2015 21:50:55 +0000
reviewersbhearsum
bugs1106707
Bug 1106707 - Pass through the platform and the tooltool server urls, r=bhearsum
misc.py
--- a/misc.py
+++ b/misc.py
@@ -2986,18 +2986,21 @@ def generateSpiderMonkeyObjects(project,
                                      'mock_copyin_files']
             factory_kwargs = {}
             for a in factory_platform_args:
                 if a in pf:
                     factory_kwargs[a] = pf[a]
             factory_kwargs['env'] = env
 
             extra_args = ['-r', WithProperties("%(revision)s")]
+            extra_args += ['--platform', platform]  # distinguish win64
             extra_args += mirrorAndBundleArgs(bconfig)
             extra_args += [variant]
+            for server in config.get('tooltool_url_list', []):
+                extra_args += ['--ttserver', server]
 
             f = ScriptFactory(
                 config['scripts_repo'],
                 'scripts/spidermonkey_builds/spidermonkey.sh',
                 interpreter=interpreter,
                 log_eval_func=rc_eval_func({1: WARNINGS}),
                 extra_args=tuple(extra_args),
                 script_timeout=3600,