Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -448,11 +448,6 @@ # '--target=arm-eabi', # '--enable-targets=arm'])}, -# {'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, clean=False)}, - {'name' : "clang-hexagon-elf", 'slavenames' :["hexagon-build-02", "hexagon-build-03"], 'builddir' :"clang-hexagon-elf", Index: zorg/buildbot/builders/ClangBuilder.py =================================================================== --- zorg/buildbot/builders/ClangBuilder.py +++ zorg/buildbot/builders/ClangBuilder.py @@ -40,10 +40,7 @@ force_checkout=False, extra_clean_step=None, checkout_compiler_rt=False, - checkout_lld=False, - run_gdb=False, - run_modern_gdb=False, - run_gcc=False): + checkout_lld=False): # Prepare environmental variables. Set here all env we want everywhere. merged_env = { 'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences. @@ -185,7 +182,6 @@ command=['nice', '-n', '10', make, WithProperties("-j%s" % jobs)], haltOnFailure=True, - flunkOnFailure=not run_gdb, description=["compiling", stage1_config], descriptionDone=["compile", stage1_config], workdir=llvm_1_objdir, @@ -216,7 +212,6 @@ command=[make, "check-all", "VERBOSE=1", WithProperties("LIT_ARGS=%s" % clangTestArgs), WithProperties("EXTRA_TESTDIRS=%s" % extraTestDirs)], - flunkOnFailure=not run_gdb, description=["checking"], descriptionDone=["checked"], workdir=llvm_1_objdir, @@ -225,16 +220,6 @@ # TODO: Install llvm and clang for stage1. - 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) - if not useTwoStage: if package_dst: name = WithProperties( @@ -896,97 +881,3 @@ workdir="llvm\\build\\tools\\clang\\test")) return f - -def addClangGCCTests(f, ignores={}, install_prefix="%(builddir)s/llvm.install", - languages = ('gcc', 'g++', 'objc', 'obj-c++')): - make_vars = [WithProperties( - 'CC_UNDER_TEST=%s/bin/clang' % install_prefix), - WithProperties( - 'CXX_UNDER_TEST=%s/bin/clang++' % install_prefix)] - f.addStep(SVN(name='svn-clang-gcc-tests', mode='update', - baseURL='http://llvm.org/svn/llvm-project/clang-tests/', - defaultBranch='trunk', workdir='clang-tests')) - gcc_dg_ignores = ignores.get('gcc-4_2-testsuite', {}) - for lang in languages: - f.addStep(commands.SuppressionDejaGNUCommand.SuppressionDejaGNUCommand( - name='test-gcc-4_2-testsuite-%s' % lang, - command=["make", "-k", "check-%s" % lang] + make_vars, - description="gcc-4_2-testsuite (%s)" % lang, - workdir='clang-tests/gcc-4_2-testsuite', - logfiles={ 'dg.sum' : 'obj/%s/%s.sum' % (lang, lang), - '%s.log' % lang : 'obj/%s/%s.log' % (lang, lang)}, - ignore=gcc_dg_ignores.get(lang, []))) - -def addClangGDBTests(f, ignores={}, install_prefix="%(builddir)s/llvm.install"): - make_vars = [WithProperties( - 'CC_UNDER_TEST=%s/bin/clang' % install_prefix), - WithProperties( - 'CXX_UNDER_TEST=%s/bin/clang++' % install_prefix)] - f.addStep(SVN(name='svn-clang-gdb-tests', mode='update', - baseURL='http://llvm.org/svn/llvm-project/clang-tests/', - defaultBranch='trunk', workdir='clang-tests')) - f.addStep(commands.SuppressionDejaGNUCommand.SuppressionDejaGNUCommand( - name='test-gdb-1472-testsuite', - command=["make", "-k", "check"] + make_vars, - description="gdb-1472-testsuite", - workdir='clang-tests/gdb-1472-testsuite', - 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=\'{0}/bin/clang\' ' - 'CXX_FOR_TARGET=\'{0}/bin/clang++\' ' - 'CFLAGS_FOR_TARGET=\'-w -fno-limit-debug-info\'' - .format(install_prefix))] - f.addStep(SVN(name='svn-clang-modern-gdb-tests', mode='update', - svnurl='http://llvm.org/svn/llvm-project/clang-tests-external/trunk/gdb/7.5', - workdir='clang-tests/src')) - f.addStep(Configure(command='../src/configure', - workdir='clang-tests/build/')) - f.addStep(WarningCountingShellCommand(name='gdb-75-build', - command=['make', WithProperties('-j%s' % jobs)], - haltOnFailure=True, - workdir='clang-tests/build')) - f.addStep(commands.DejaGNUCommand.DejaGNUCommand( - name='gdb-75-check', - command=['make', '-k', WithProperties('-j%s' % jobs), 'check'] + make_vars, - workdir='clang-tests/build', - logfiles={'dg.sum':'gdb/testsuite/gdb.sum', - 'gdb.log':'gdb/testsuite/gdb.log'})) - - - -# FIXME: Deprecated. -addClangTests = addClangGCCTests - -def getClangTestsIgnoresFromPath(path, key): - def readList(path): - if not os.path.exists(path): - return [] - - f = open(path) - lines = [ln.strip() for ln in f] - f.close() - return lines - - ignores = {} - - gcc_dg_ignores = {} - for lang in ('gcc', 'g++', 'objc', 'obj-c++'): - lang_path = os.path.join(path, 'gcc-4_2-testsuite', 'expected_results', - key, lang) - gcc_dg_ignores[lang] = ( - readList(os.path.join(lang_path, 'FAIL.txt')) + - readList(os.path.join(lang_path, 'UNRESOLVED.txt')) + - readList(os.path.join(lang_path, 'XPASS.txt'))) - ignores['gcc-4_2-testsuite' ] = gcc_dg_ignores - - ignores_path = os.path.join(path, 'gdb-1472-testsuite', 'expected_results', - key) - gdb_dg_ignores = ( - readList(os.path.join(ignores_path, 'FAIL.txt')) + - readList(os.path.join(ignores_path, 'UNRESOLVED.txt')) + - readList(os.path.join(ignores_path, 'XPASS.txt'))) - ignores['gdb-1472-testsuite' ] = gdb_dg_ignores - - return ignores