[llvm-commits] [zorg] r172885 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[NAKAMURA Takumi]

Author: chapuni
Date: Fri Jan 18 21:39:07 2013
New Revision: 172885

URL: http://llvm.org/viewvc/llvm-project?rev=172885&view=rev
Log:
ClangBuilder: Use LIT_ARGS=clangTestArgs, or valgrind would not be enabled.

FIXME: Valgrind affects also llvm tests. Is it expected?

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=172885&r1=172884&r2=172885&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri Jan 18 21:39:07 2013
@@ -208,7 +208,7 @@
                                               workdir=llvm_1_objdir,
                                               env=merged_env))
 
-    clangTestArgs = llvmTestArgs = '-v -j %s' % jobs
+    clangTestArgs = '-v -j %s' % jobs
     if valgrind:
         clangTestArgs += ' --vg'
         if valgrindLeakCheck:
@@ -220,8 +220,7 @@
     if test:
         f.addStep(LitTestCommand(name='check-all',
                                    command=[make, "check-all", "VERBOSE=1",
-                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs),
-                                            WithProperties("TESTARGS=%s" % clangTestArgs),
+                                            WithProperties("LIT_ARGS=%s" % clangTestArgs),
                                             WithProperties("EXTRA_TESTDIRS=%s" % extraTestDirs)],
                                    description=["checking"],
                                    descriptionDone=["checked"],
@@ -323,8 +322,7 @@
     if test:
         f.addStep(LitTestCommand(name='check-all',
                                    command=[make, "check-all", "VERBOSE=1",
-                                            WithProperties("LIT_ARGS=%s" % llvmTestArgs),
-                                            WithProperties("TESTARGS=%s" % clangTestArgs),
+                                            WithProperties("LIT_ARGS=%s" % clangTestArgs),
                                             WithProperties("EXTRA_TESTDIRS=%s" % extraTestDirs)],
                                    description=["checking"],
                                    descriptionDone=["checked"],