Chromium Code Reviews| Index: masters/master.tryserver.nacl/master.cfg |
| =================================================================== |
| --- masters/master.tryserver.nacl/master.cfg (revision 79759) |
| +++ masters/master.tryserver.nacl/master.cfg (working copy) |
| @@ -66,6 +66,9 @@ |
| 'native_client', 'arm', use_supplement=True, |
| switched_to_annotations=True).NativeClientFactory |
| +for platform in [m_win32, m_win64, m_mac, m_linux, m_arm]: |
| + platform['nacl-toolchain'] = platform['nacl'] |
| + |
| m_win64['naclsdk'] = nacl_sdk_factory.NativeClientSDKFactory( |
| 'native_client', 'wincyg').NativeClientSDKFactory |
| m_linux['naclsdk'] = nacl_sdk_factory.NativeClientSDKFactory( |
| @@ -94,6 +97,8 @@ |
| constructed from the builder name.""" |
| if platform not in ('win32', 'win64', 'linux', 'mac', 'arm'): |
| raise Exception(platform + ' is not an known os type') |
| + if not target: |
| + target = 'dbg' |
|
Matt Ball
2011/03/30 17:26:55
Could this be removed if we change the default of
|
| # Don't enable auto_reboot for people testing locally. |
| auto_reboot = ActiveMaster.is_production_host |
| if platform == 'win32': |
| @@ -113,7 +118,7 @@ |
| formats = ['scons', 'linux'] |
| # Arm slaves have issue rebooting continuously. |
| auto_reboot = False |
| - if project == 'nacl': |
| + if project in ['nacl', 'nacl-toolchain']: |
| builder_factory = factory( |
| slave_type='Trybot', target=target, tests=tests, options=options, |
| mode=mode, compile_timeout=timeout, clobber=True, |
| @@ -292,7 +297,6 @@ |
| }, |
| { |
| 'name': 'gyp', |
| - 'tests': [], |
| 'platforms': [ |
| { |
| 'name': 'linux', |
| @@ -300,12 +304,15 @@ |
| }, |
| { |
| 'name': 'mac', |
| + 'builder_names': ['mac'], |
| }, |
| { |
| 'name': 'win32', |
| + 'builder_names': ['win32'], |
| }, |
| { |
| 'name': 'win64', |
| + 'builder_names': ['win64'], |
| }, |
| ], |
| }, |