Index: scripts/master/factory/chromium_factory.py |
diff --git a/scripts/master/factory/chromium_factory.py b/scripts/master/factory/chromium_factory.py |
index b3019b5f5eca97f100e39c7f5abb8371efed3a28..ee6d309fd1b8301468eff4fcbeb5e3a18a46ad9d 100644 |
--- a/scripts/master/factory/chromium_factory.py |
+++ b/scripts/master/factory/chromium_factory.py |
@@ -879,10 +879,15 @@ class ChromiumFactory(gclient_factory.GClientFactory): |
# Ensure GYP errors out if files referenced in .gyp files are missing. |
self.ForceMissingFilesToBeFatal(project, factory_properties['gclient_env']) |
+ is_windows_asan_builder = (slave_type == 'Builder' and |
M-A Ruel
2012/11/28 15:07:48
and BuilderTester?
iannucci
2012/11/29 02:31:38
Nope, just builder, since the zip step doesn't hap
|
+ self._target_platform == 'win32' and |
+ factory_properties.get('asan')) |
M-A Ruel
2012/11/28 15:07:48
but in scripts/master/factory/gclient_factory.py l
iannucci
2012/11/29 02:31:38
Agreed... I checked GCLIENT_ENV there to be consis
|
+ |
factory = self.BuildFactory(target, clobber, tests_for_build, mode, |
slave_type, options, compile_timeout, build_url, |
project, factory_properties, |
- gclient_deps=gclient_deps) |
+ gclient_deps=gclient_deps, |
+ skip_archive_steps=is_windows_asan_builder) |
# Get the factory command object to create new steps to the factory. |
chromium_cmd_obj = chromium_commands.ChromiumCommands(factory, |
@@ -890,6 +895,15 @@ class ChromiumFactory(gclient_factory.GClientFactory): |
self._build_dir, |
self._target_platform) |
+ # Add ASANification step for windows |
+ # MUST BE FIRST STEP ADDED AFTER BuildFactory CALL in order to add back |
+ # the ZipBuild step in it's expected place |
+ if is_windows_asan_builder: |
+ chromium_cmd_obj.AddWindowsASANStep() |
+ # Need to add the Zip Build step back |
+ chromium_cmd_obj.AddZipBuild(halt_on_failure=True, |
+ factory_properties=factory_properties) |
+ |
# Add this archive build step. |
if factory_properties.get('archive_build'): |
chromium_cmd_obj.AddArchiveBuild(factory_properties=factory_properties) |