[llvm-commits] [zorg] r103108 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py zorg/buildbot/builders/LLVMBuilder.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed May  5 13:42:33 2010
New Revision: 103108

URL: http://llvm.org/viewvc/llvm-project?rev=103108&view=rev
Log:
buildbot: Add valgrind suppressions for vg_leak builders.


Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=103108&r1=103107&r2=103108&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed May  5 13:42:33 2010
@@ -42,12 +42,14 @@
          'slavenames':["osu8"],
          'builddir':"llvm-i686-linux-vg_leak",
          'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", valgrind=True,
-                                                    valgrindLeakCheck=True)},
+                                                    valgrindLeakCheck=True,
+                                                    valgrindSuppressions='utils/valgrind/i386-pc-linux-gnu.supp')},
         {'name': "llvm-x86_64-linux-vg_leak",
          'slavenames':["osu7"],
          'builddir':"llvm-x86_64-linux-vg_leak",
          'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", valgrind=True,
-                                                    valgrindLeakCheck=True)},
+                                                    valgrindLeakCheck=True,
+                                                    valgrindSuppressions='utils/valgrind/x86_64-pc-linux-gnu.supp')},
         ]
 
 # Offline.
@@ -276,6 +278,15 @@
          'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2),
          'category' : 'clang.exp' },
 
+        {'name': "clang-i686-freebsd-selfhost-rel",
+         'slavenames':["freebsd1"],
+         'builddir':"clang-i686-freebsd-selfhost-rel",
+         'factory': ClangBuilder.getClangBuildFactory(triple='i686-pc-freebsd',
+                                                      useTwoStage=True,
+                                                      stage1_config='Release',
+                                                      stage2_config='Release'),
+         'category' : 'clang.exp' },
+
         ]
 
 def get_builders():

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=103108&r1=103107&r2=103108&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Wed May  5 13:42:33 2010
@@ -11,7 +11,8 @@
 
 def getLLVMBuildFactory(triple=None, clean=True, test=True,
                         expensive_checks=False, examples=False, valgrind=False,
-                        valgrindLeakCheck=False, jobs='%(jobs)s', timeout=20, make='make',
+                        valgrindLeakCheck=False, valgrindSuppressions=None,
+                        jobs='%(jobs)s', timeout=20, make='make',
                         enable_shared=False):
     f = buildbot.process.factory.BuildFactory()
 
@@ -75,6 +76,8 @@
             litTestArgs += ' --vg '
             if valgrindLeakCheck:
                 litTestArgs += ' --vg-leak'
+            if valgrindSuppressions is not None:
+                litTestArgs += ' --vg-arg --suppressions=%%(builddir)s/%s' % valgrindSuppressions
         f.addStep(ClangTestCommand(name='test-llvm',
                                    command=[make, "check-lit", "VERBOSE=1",
                                             "LIT_ARGS=%s" % litTestArgs],