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

[David Blaikie]

Author: dblaikie
Date: Mon Aug 13 17:24:46 2012
New Revision: 161799

URL: http://llvm.org/viewvc/llvm-project?rev=161799&view=rev
Log:
Experiment with a gdb/gcc dejagnu test runner in the lab.

This is a bit cheesy just slapping it in as an option to the ClangBuilder, so
if anyone has ideas how they'd like to see the variations, extension points, 
etc, implemented - feel free to let me know in post-commit review.

I've done some experimentation with this locally, but without a mac box to run
it against, so I'll be testing this in the lab with incremental/experimental
commits for now.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=161799&r1=161798&r2=161799&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Aug 13 17:24:46 2012
@@ -277,6 +277,11 @@
                                               testerName='O0-g', run_cxx_tests=True,
                                               package_cache=LabPackageCache)},
 
+        {'name' : "clang-x86_64-darwin10-gdb-gcc",
+         'slavenames' :["lab-mini-04"],
+         'builddir' :"clang-x86_64-darwin10-gdb-gcc",
+         'factory' : ClangBuilder.getClangBuildFactory(run_gdb=True, run_gcc=True)},
+
         ]
 
 # Offline.

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=161799&r1=161798&r2=161799&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Mon Aug 13 17:24:46 2012
@@ -37,7 +37,9 @@
             trunk_revision=None,
             force_checkout=False,
             extra_clean_step=None,
-            checkout_compiler_rt=False):
+            checkout_compiler_rt=False,
+            run_gdb=False,
+            run_gcc=False):
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
@@ -240,6 +242,14 @@
                                               workdir=llvm_1_objdir,
                                               env=merged_env))
 
+    if run_gdb or run_gcc:
+        ignores = getClangTestsIgnoresFromPath(os.path.expanduser('~/public/clang-tests'), 'clang-x86_64-darwin10')
+        install_prefix = "%%(builddir)s/%s" % llvm_1_installdir
+        if run_gdb:
+            addClangGDBTests(f, ignores, install_prefix)
+        if run_gcc:
+            addClangGCCTests(f, ignores, install_prefix)
+
     if not useTwoStage:
         if package_dst:
             name = WithProperties(