[llvm-commits] [zorg] r141858 - /zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py

[Duncan Sands]

Author: baldrick
Date: Thu Oct 13 02:54:14 2011
New Revision: 141858

URL: http://llvm.org/viewvc/llvm-project?rev=141858&view=rev
Log:
Try to get the clang fast nightly test builder working.

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

Modified: zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py?rev=141858&r1=141857&r2=141858&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py Thu Oct 13 02:54:14 2011
@@ -50,8 +50,6 @@
   # Build compiler to test.  
   f = ClangBuilder.getClangBuildFactory(
     triple, outOfDir=True, clean=clean, test=test,
-    # FIXME: We shouldn't need this, but --without-llvmgcc is broken.
-    extra_configure_args=['--with-llvmcc=clang'],
     **kwargs)
 
   # Get the test-suite sources.
@@ -73,7 +71,8 @@
   f.addStep(Configure(name="configure.test-suite",
                       command=['../test-suite.src/configure',
                                WithProperties("--with-llvmsrc=%(builddir)s/llvm.src"),
-                               WithProperties("--with-llvmobj=%(builddir)s/llvm.obj")],
+                               WithProperties("--with-llvmobj=%(builddir)s/llvm.obj"),
+                               WithProperties("--with-built-clang")],
                       haltOnFailure=True,
                       workdir='test-suite.obj',
                       description=["configure", "test-suite"]))