[llvm-commits] [zorg] r125197 - /zorg/trunk/buildbot/llvmlab/master/config/builders.py

[David Dean]

Author: ddean
Date: Wed Feb  9 11:35:38 2011
New Revision: 125197

URL: http://llvm.org/viewvc/llvm-project?rev=125197&view=rev
Log:
remove pulling and building llvm/clang and use the new --without-llvm* options

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/builders.py

Modified: zorg/trunk/buildbot/llvmlab/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/builders.py?rev=125197&r1=125196&r2=125197&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/builders.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/builders.py Wed Feb  9 11:35:38 2011
@@ -299,29 +299,7 @@
              description=['sanity test'],
              env={'PATH': WithProperties('%(use_path)s:${PATH}')}))
     # Pull source code.
-    f = pullllvm(f)
-    f = pullClang(f)
     f = pulltest_suite(f)
-    # It is currently necessary to build llvm in order for nightly tests to build and run.
-    # TODO: build less of llvm.
-    f.addStep(buildbot.steps.shell.ShellCommand(
-            name='configure.with.host',
-            command=[
-                     '../llvm/configure', '--enable-optimized', '--disable-bindings',
-                     '--with-llvmcc=clang', '--without-llvmgcc', '--without-llvmgxx',
-                     WithProperties('CC=%(use_path)s/clang'),
-                     WithProperties('CXX=%(use_path)s/clang++')],
-            haltOnFailure=True,
-            description=['configure'],
-            env={'PATH': WithProperties('%(use_path)s:${PATH}')},
-            workdir='llvm.obj'))
-    f.addStep(buildbot.steps.shell.ShellCommand(
-            name='make',
-            command=['make', 'tools-only', '-j', WithProperties('%(jobs)s')],
-            env={'PATH': WithProperties('%(use_path)s:${PATH}')},
-            haltOnFailure=True,
-            description=['make'],
-            workdir='llvm.obj'))
     # Clean up.
     if clean:
         f.addStep(buildbot.steps.shell.ShellCommand(
@@ -338,8 +316,7 @@
                      WithProperties('CXX=%(use_path)s/clang++'),
                      'CFLAGS='+options,
                      'CXXFLAGS='+options,
-                      WithProperties('--with-llvmsrc=%(builddir)s/llvm'),
-                      WithProperties('--with-llvmobj=%(builddir)s/llvm.obj')],
+                     '--without-llvmsrc', '--without-llvmobj'],
             haltOnFailure=True,
             description=['configure tests'],
             env={'PATH': WithProperties('%(use_path)s:${PATH}')},