[zorg] r178751 - Make the incremental bot only configure after a failed build.

[Michael Gottesman]

Author: mgottesman
Date: Thu Apr  4 02:57:31 2013
New Revision: 178751

URL: http://llvm.org/viewvc/llvm-project?rev=178751&view=rev
Log:
Make the incremental bot only configure after a failed build.

*NOTE* This should make the first incremental build always fail.

*NOTE* I am going to remove this and replace it with a ninja/cmake
builder when I get a chance.

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=178751&r1=178750&r2=178751&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Thu Apr  4 02:57:31 2013
@@ -780,10 +780,22 @@ def phasedClang(config_options, is_boots
           '--with-extra-options=-flto -gline-tables-only')
     
     # Configure the LLVM build.
-    f.addStep(buildbot.steps.shell.ShellCommand(
-              name='configure.with.host', command=configure_args,
-              haltOnFailure=True, description=['configure'],
-              workdir=clang_build_dir))
+    if incremental:
+        # *NOTE* This is a temporary work around. I am eventually going to just
+        # set up cmake/ninja but for now I am sticking with the make => I need
+        # configure to run only after a failure so on success I have incremental
+        # builds.
+        f.addStep(buildbot.steps.shell.ShellCommand(
+                name='configure.with.host', command=configure_args,
+                haltOnFailure=True, description=['configure'],
+                workdir=clang_build_dir,
+                doStepIf=_did_last_build_fail))
+    else:
+        f.addStep(buildbot.steps.shell.ShellCommand(
+                name='configure.with.host', command=configure_args,
+                haltOnFailure=True, description=['configure'],
+                workdir=clang_build_dir))
+    
     # Build the compiler.
     make_command = ['make', '-j', WithProperties('%(jobs)s')]
     timeout = 20*60 # Normal timeout is 20 minutes.