Chromium Code Reviews| Index: scripts/master/factory/gclient_factory.py |
| diff --git a/scripts/master/factory/gclient_factory.py b/scripts/master/factory/gclient_factory.py |
| index 8655b3f9b612748b73499bb7cad58ac9b4e5ee57..367afcd94753c640df7db46fb10fc193d9ede7a2 100644 |
| --- a/scripts/master/factory/gclient_factory.py |
| +++ b/scripts/master/factory/gclient_factory.py |
| @@ -209,7 +209,7 @@ class GClientFactory(object): |
| slave_type='BuilderTester', options=None, |
| compile_timeout=1200, build_url=None, project=None, |
| factory_properties=None, gclient_deps=None, |
| - target_arch=None): |
| + target_arch=None, add_archive_steps=True): |
|
nsylvain
2012/11/27 00:23:15
What about "skip_archive_steps=False" instead. It
iannucci
2012/11/27 01:39:13
Good call. Done.
|
| factory_properties = factory_properties or {} |
| if options and '--build-tool=ninja' in options: |
| factory_properties['gclient_env']['GYP_GENERATORS'] = 'ninja' |
| @@ -236,7 +236,8 @@ class GClientFactory(object): |
| # Update clang if necessary. |
| gclient_env = factory_properties.get('gclient_env', {}) |
| if ('clang=1' in gclient_env.get('GYP_DEFINES', '') or |
| - 'asan=1' in gclient_env.get('GYP_DEFINES', '')): |
| + (self._target_platform != 'win32' and |
| + 'asan=1' in gclient_env.get('GYP_DEFINES', ''))): |
| factory_cmd_obj.AddUpdateClangStep() |
| # Add a step to cleanup temporary files and data left from a previous run |
| @@ -253,15 +254,16 @@ class GClientFactory(object): |
| timeout=compile_timeout, |
| env=factory_properties.get('compile_env')) |
| - # Archive the full output directory if the machine is a builder. |
| - if slave_type == 'Builder': |
| - factory_cmd_obj.AddZipBuild(halt_on_failure=True, |
| - factory_properties=factory_properties) |
| + if add_archive_steps: |
| + # Archive the full output directory if the machine is a builder. |
| + if slave_type == 'Builder': |
| + factory_cmd_obj.AddZipBuild(halt_on_failure=True, |
| + factory_properties=factory_properties) |
| - # Download the full output directory if the machine is a tester. |
| - if slave_type == 'Tester': |
| - factory_cmd_obj.AddExtractBuild(build_url, |
| - factory_properties=factory_properties) |
| + # Download the full output directory if the machine is a tester. |
| + if slave_type == 'Tester': |
| + factory_cmd_obj.AddExtractBuild(build_url, |
| + factory_properties=factory_properties) |
| return factory |