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

[Daniel Dunbar]

Author: ddunbar
Date: Sat Mar 20 20:24:00 2010
New Revision: 99109

URL: http://llvm.org/viewvc/llvm-project?rev=99109&view=rev
Log:
Add optional argument to enable running with --vg-leak.


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=99109&r1=99108&r2=99109&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Sat Mar 20 20:24:00 2010
@@ -15,7 +15,7 @@
 
 def getClangBuildFactory(triple=None, clean=True, test=True, package_dst=None,
                          run_cxx_tests=False, examples=False, valgrind=False,
-                         outOfDir=False, useTwoStage=False,
+                         valgrindLeakCheck=False, outOfDir=False, useTwoStage=False,
                          make='make', jobs="%(jobs)s",
                          stage1_config='Debug', stage2_config='Release',
                          extra_configure_args=[]):
@@ -105,7 +105,10 @@
     clangTestArgs = '-v'
     if valgrind:
         clangTestArgs += ' --vg '
-        clangTestArgs += ' --vg-arg --leak-check=no'
+        if valgrindLeakCheck:
+            clangTestArgs += ' --vg-leak'
+        else:
+            clangTestArgs += ' --vg-arg --leak-check=no'
         clangTestArgs += ' --vg-arg --suppressions=%(builddir)s/llvm/tools/clang/utils/valgrind/x86_64-pc-linux-gnu_gcc-4.3.3.supp'
     extraTestDirs = ''
     if run_cxx_tests:

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=99109&r1=99108&r2=99109&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Sat Mar 20 20:24:00 2010
@@ -11,7 +11,7 @@
 
 def getLLVMBuildFactory(triple=None, clean=True, test=True,
                         expensive_checks=False, examples=False, valgrind=False,
-                        jobs='%(jobs)s', timeout=20, make='make',
+                        valgrindLeakCheck=False, jobs='%(jobs)s', timeout=20, make='make',
                         enable_shared=False):
     f = buildbot.process.factory.BuildFactory()
 
@@ -73,7 +73,10 @@
         litTestArgs = '-v'
         if valgrind:
             litTestArgs += ' --vg '
-            litTestArgs += ' --vg-arg --leak-check=full'
+            if valgrindLeakCheck:
+                litTestArgs += ' --vg-leak'
+            else:
+                litTestArgs += ' --vg-arg --leak-check=no'
         f.addStep(ClangTestCommand(name='test-llvm',
                                    command=[make, "check-lit", "VERBOSE=1",
                                             "LIT_ARGS=%s" % litTestArgs],