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

[David Blaikie]

Author: dblaikie
Date: Wed Jan  2 15:11:09 2013
New Revision: 171411

URL: http://llvm.org/viewvc/llvm-project?rev=171411&view=rev
Log:
Remove support for suppressing the GDB 7.5 test suite baseline now that it doesn't exist.

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=171411&r1=171410&r2=171411&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jan  2 15:11:09 2013
@@ -40,8 +40,7 @@
             checkout_compiler_rt=False,
             run_gdb=False,
             run_modern_gdb=False,
-            run_gcc=False,
-            baseline_modern_gdb=True):
+            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.
@@ -245,7 +244,7 @@
         if run_gdb:
             addClangGDBTests(f, ignores, install_prefix)
         if run_modern_gdb:
-            addModernClangGDBTests(f, jobs, install_prefix, baseline_modern_gdb)
+            addModernClangGDBTests(f, jobs, install_prefix)
         if run_gcc:
             addClangGCCTests(f, ignores, install_prefix)
 
@@ -566,16 +565,12 @@
             logfiles={ 'dg.sum' : 'obj/filtered.gdb.sum',
                        'gdb.log' : 'obj/gdb.log' }))
 
-def addModernClangGDBTests(f, jobs, install_prefix, baseline):
-    # strangely, we want to put CC_FOR_TARGET, CXX_FOR_TARGET, etc. inside the
-    # RUNTESTFLAGS value, not as separate parameters to make
-    suppress_baseline = ''
-    if not baseline:
-        suppress_baseline = 'SUPPRESS_CLANG_BASELINE=1'
+def addModernClangGDBTests(f, jobs, install_prefix):
     make_vars = [WithProperties('RUNTESTFLAGS=CC_FOR_TARGET=\'{0}/bin/clang\' '
                                 'CXX_FOR_TARGET=\'{0}/bin/clang++\' '
-                                'CFLAGS_FOR_TARGET=\'-w -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-limit-debug-info\' '
-                                '{1}'.format(install_prefix, suppress_baseline)),
+                                'CFLAGS_FOR_TARGET=\'-w -fno-omit-frame-pointer '
+                                '-mno-omit-leaf-frame-pointer -fno-limit-debug-info\''
+                                .format(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',