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

[David Blaikie]

Author: dblaikie
Date: Fri Nov 16 16:37:12 2012
New Revision: 168214

URL: http://llvm.org/viewvc/llvm-project?rev=168214&view=rev
Log:
Try running the newly added GDB 7.5 test suite.

(no suppression for the copious failures yet)

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=168214&r1=168213&r2=168214&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Nov 16 16:37:12 2012
@@ -292,11 +292,15 @@
                                               testerName='O0-g', run_cxx_tests=True,
                                               package_cache=LabPackageCache)},
 
-        {'name' : "clang-x86_64-darwin10-gdb-gcc",
+        {'name' : "clang-x86_64-darwin10-gdb",
          'slavenames' :["lab-mini-04"],
-         'builddir' :"clang-x86_64-darwin10-gdb-gcc",
+         'builddir' :"clang-x86_64-darwin10-gdb",
          'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10', stage1_config='Release+Asserts', run_gdb=True)},
 
+        {'name' : "clang-x86_64-ubuntu-gdb-75",
+         'slavenames' :["hpproliant1"],
+         'builddir' :"clang-x86_64-ubuntu-gdb-75",
+         'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts', run_modern_gdb=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=168214&r1=168213&r2=168214&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri Nov 16 16:37:12 2012
@@ -38,6 +38,7 @@
             extra_clean_step=None,
             checkout_compiler_rt=False,
             run_gdb=False,
+            run_modern_gdb=False,
             run_gcc=False):
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
@@ -47,7 +48,7 @@
         # Overwrite pre-set items with the given ones, so user can set anything.
         merged_env.update(env)
 
-    if run_gdb or run_gcc:
+    if run_gdb or run_gcc or run_modern_gdb:
         outOfDir = True
         
     # Don't use in-dir builds with a two stage build process.
@@ -234,11 +235,13 @@
                                               workdir=llvm_1_objdir,
                                               env=merged_env))
 
-    if run_gdb or run_gcc:
+    if run_gdb or run_gcc or run_modern_gdb:
         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_modern_gdb:
+            addModernClangGDBTests(f, jobs, install_prefix)
         if run_gcc:
             addClangGCCTests(f, ignores, install_prefix)
 
@@ -557,6 +560,24 @@
             logfiles={ 'dg.sum' : 'obj/filtered.gdb.sum',
                        'gdb.log' : 'obj/gdb.log' }))
 
+def addModernClangGDBTests(f, jobs, install_prefix):
+    make_vars = [WithProperties('RUNTESTFLAGS="CC_FOR_TARGET=%s/bin/clang CXX_FOR_TARGET=%s/bin/clang++"' % install_prefix),
+                 "FORCE_PARALLEL=1"]
+    f.addStep(SVN(name='svn-clang-tests', mode='update',
+                  svnurl='http://llvm.org/svn/llvm-project/clang-tests-external/trunk/gdb/7.5/gdb/testsuite',
+                  workdir='clang-tests/src'))
+    f.addStep(Configure(command='../src/configure',
+                        workdir='clang-tests/build'))
+    f.addStep(DejaGNUCommand.DejaGNUCommand(
+            name='gdb-75-check',
+            command=["make", "-k", WithProperties("-j%s" % jobs), "check"] + make_vars,
+            env={'PATH': ['/home/buildslave/gdb-install/bin', '${PATH}']},
+            workdir='clang-tests/build',
+            logfiles={'dg.sum':'dg.sum', 
+                      'gdb.log':'gdb.log'}))
+
+
+
 # FIXME: Deprecated.
 addClangTests = addClangGCCTests