[llvm-commits] [zorg] r106635 - in /zorg/trunk/zorg/buildbot/builders: ClangBuilder.py LLVMBuilder.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jun 23 12:42:14 2010
New Revision: 106635

URL: http://llvm.org/viewvc/llvm-project?rev=106635&view=rev
Log:
buildbot: Change test steps to honor jobs property when running 'lit'.

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=106635&r1=106634&r2=106635&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jun 23 12:42:14 2010
@@ -114,7 +114,7 @@
                                               descriptionDone=["compile", stage1_config, "examples"],
                                               workdir=llvm_1_objdir))
 
-    clangTestArgs = '-v'
+    clangTestArgs = llvmTestArgs = '-v -j %s' % jobs
     if valgrind:
         clangTestArgs += ' --vg'
         if valgrindLeakCheck:
@@ -125,7 +125,8 @@
         extraTestDirs += '%(builddir)s/llvm/tools/clang/utils/C++Tests'
     if test:
         f.addStep(ClangTestCommand(name='test-llvm',
-                                   command=[make, "check-lit", "VERBOSE=1"],
+                                   command=[make, "check-lit", "VERBOSE=1",
+                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs)],
                                    description=["testing", "llvm"],
                                    descriptionDone=["test", "llvm"],
                                    workdir=llvm_1_objdir,
@@ -188,7 +189,8 @@
 
     if test:
         f.addStep(ClangTestCommand(name='test-llvm',
-                                   command=[make, "check-lit", "VERBOSE=1"],
+                                   command=[make, "check-lit", "VERBOSE=1",
+                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs)],
                                    description=["testing", "llvm"],
                                    descriptionDone=["test", "llvm"],
                                    workdir=llvm_2_objdir,

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=106635&r1=106634&r2=106635&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Wed Jun 23 12:42:14 2010
@@ -71,7 +71,7 @@
                                               workdir='llvm',
                                               timeout=timeout*60))
     if test:
-        litTestArgs = '-v'
+        litTestArgs = '-v -j %s' % jobs
         if valgrind:
             litTestArgs += ' --vg '
             if valgrindLeakCheck: