[zorg] r284054 - Build clang and LLD earlier in the Windows asan bot config

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Wed Oct 12 16:32:54 2016
New Revision: 284054

URL: http://llvm.org/viewvc/llvm-project?rev=284054&view=rev
Log:
Build clang and LLD earlier in the Windows asan bot config

Right now the "check" step builds LLVM, Clang, and LLD, which is an
awful lot of compilation to do during a testing step. Doing that work up
front will make it obvious if there's a compilation issue in Clang or
LLD without having to click through to the testing logs.

Modified:
    zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py?rev=284054&r1=284053&r2=284054&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderWindows.py Wed Oct 12 16:32:54 2016
@@ -84,7 +84,7 @@ def getSanitizerWindowsBuildFactory(
                            env=Property('slave_env')))
 
     # Build compiler-rt first to speed up detection of Windows-specific
-    # compiler-time errors in the sanitizers runtime.
+    # compiler-time errors in the sanitizer runtimes.
     f.addStep(NinjaCommand(name='build compiler-rt',
                            targets=['compiler-rt'],
                            haltOnFailure=True,
@@ -92,9 +92,19 @@ def getSanitizerWindowsBuildFactory(
                            workdir=build_dir,
                            env=Property('slave_env')))
 
+    # Build Clang and LLD next so that most compilation errors occur in a build
+    # step.
+    f.addStep(NinjaCommand(name='build clang lld',
+                           targets=['clang', 'lld'],
+                           haltOnFailure=True,
+                           description='ninja clang lld',
+                           workdir=build_dir,
+                           env=Property('slave_env')))
+
     # Only run sanitizer tests.
     # Don't build targets that are not required in order to speed up the cycle.
-    test_targets = ['check-asan','check-asan-dynamic','check-sanitizer', 'check-cfi']
+    test_targets = ['check-asan', 'check-asan-dynamic', 'check-sanitizer',
+                    'check-cfi']
     f.addStep(NinjaCommand(name='run tests',
                            targets=test_targets,
                            haltOnFailure=True,