[llvm-commits] [zorg] r109942 - /zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jul 30 23:29:22 2010
New Revision: 109942

URL: http://llvm.org/viewvc/llvm-project?rev=109942&view=rev
Log:
buildbot/LLVM: Add config name, default branch, and configured targets options.

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

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=109942&r1=109941&r2=109942&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Fri Jul 30 23:29:22 2010
@@ -9,11 +9,14 @@
 
 from zorg.buildbot.commands.ClangTestCommand import ClangTestCommand
 
+from Util import getConfigArgs
+
 def getLLVMBuildFactory(triple=None, clean=True, test=True,
                         expensive_checks=False, examples=False, valgrind=False,
                         valgrindLeakCheck=False, valgrindSuppressions=None,
                         jobs='%(jobs)s', timeout=20, make='make',
-                        enable_shared=False):
+                        enable_shared=False, enable_targets=None, defaultBranch='trunk',
+                        config_name='Debug+Asserts'):
     f = buildbot.process.factory.BuildFactory()
 
     # Determine the build directory.
@@ -26,15 +29,14 @@
     # Checkout sources.
     f.addStep(SVN(name='svn-llvm',
                   mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
-                  defaultBranch='trunk',
+                  defaultBranch=defaultBranch,
                   workdir='llvm'))
 
     # Force without llvm-gcc so we don't run afoul of Frontend test failures.
     configure_args = ["./configure", "--without-llvmgcc", "--without-llvmgxx"]
-    config_name = 'Debug+Asserts'
-    if expensive_checks:
-        configure_args.append('--enable-expensive-checks')
-        config_name += '+Checks'
+    configure_args += getConfigArgs(config_name)
+    if enable_targets is not None:
+        configure_args.append('--enable-targets %s' % enable_targets)
     if triple:
         configure_args += ['--build=%s' % triple,
                            '--host=%s' % triple,