Add Windows ASAN bots.

scripts/master/factory/chromium_factory.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 861 matching lines @@
 
     tests_for_build = [
         re.match('^(?:valgrind_|heapcheck_)?(.*)$', t).group(1) for t in tests]
 
     # Ensure that component is set correctly in the gyp defines.
     ForceComponent(target, project, factory_properties['gclient_env'])
 
     # 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 happen on builder testers
already.

+                               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 line 240 you check for asan=1
in GCLIENT_ENV instead. I guess it's fine for now but this should be cleaned up
eventually.

[iannucci, 2012/11/29 02:31:38]

Agreed... I checked GCLIENT_ENV there to be consistent in that file, but it
seems that generally, factory_properties is better. I'll break convention there
to go towards the better way (factory_properties).

+
     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,
                                                           target,
                                                           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)
 
     if factory_properties.get('asan_archive_build'):
       chromium_cmd_obj.AddAsanArchiveBuild(
           factory_properties=factory_properties)
 
     # Add the package source step.
     if slave_type == 'Indexer':
@@ skipping 362 matching lines @@
                                                build_dir=web_build_dir)
       chromium_cmd_obj.AddChromebotServer(factory_properties)
       chromium_cmd_obj.AddReliabilityTests(client_os)
     elif slave_type == 'ChromebotClient':
       chromium_cmd_obj.AddGetBuildForChromebot(client_os,
                                                extract=True,
                                                build_url=build_url)
       chromium_cmd_obj.AddChromebotClient(factory_properties)
 
     return factory