Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -29,7 +29,7 @@ {'name': "llvm-mips-linux", 'slavenames':["mipsswbrd002"], 'builddir':"llvm-mips-linux", - 'factory': LLVMBuilder.getLLVMCMakeBuildFactory( + 'factory': LLVMBuilder.getLLVMBuildFactory( timeout=40, config_name='Release', enable_shared=True, extra_cmake_args=["-DLLVM_HOST_TRIPLE=mips-linux-gnu", @@ -43,7 +43,7 @@ {'name': "llvm-hexagon-elf", 'slavenames':["hexagon-build-02", "hexagon-build-03"], 'builddir':"llvm-hexagon-elf", - 'factory': LLVMBuilder.getLLVMCMakeBuildFactory( + 'factory': LLVMBuilder.getLLVMBuildFactory( timeout=40, config_name='Release', jobs=16, enable_shared=False, @@ -76,7 +76,7 @@ {'name': "llvm-avr-linux", 'slavenames':["avr-build-01"], 'builddir':"llvm-avr-linux", - 'factory': LLVMBuilder.getLLVMCMakeBuildFactory( + 'factory': LLVMBuilder.getLLVMBuildFactory( timeout=40, config_name='Release', enable_shared=True, extra_cmake_args=[ Index: test/buildbot/builders/Import.py =================================================================== --- test/buildbot/builders/Import.py +++ test/buildbot/builders/Import.py @@ -1,13 +1,11 @@ # RUN: python %s import zorg -from zorg.buildbot.builders import ClangBuilder, LLVMBuilder +from zorg.buildbot.builders import ClangBuilder from zorg.buildbot.builders import SanitizerBuilder # Just check that we can instantiate the build factors, what else can we do? print ClangBuilder.getClangBuildFactory() -print LLVMBuilder.getLLVMBuildFactory() - print SanitizerBuilder.getSanitizerBuildFactory() Index: zorg/buildbot/builders/LLVMBuilder.py =================================================================== --- zorg/buildbot/builders/LLVMBuilder.py +++ zorg/buildbot/builders/LLVMBuilder.py @@ -12,131 +12,6 @@ from Util import getConfigArgs def getLLVMBuildFactory( - triple = None, # Triple to build, host, and target. - clean = True, # "clean-llvm" step is requested if true. - test = True, # "test-llvm" step is requested if true. - expensive_checks = False, - examples = False, # "compile.examples" step is requested if true. - valgrind = False, # Valgrind is used on "test-llvm" step if true. - valgrindLeakCheck = False, # Valgrind leak check is requested if true. - valgrindSuppressions = None, # Valgrind suppression file. - jobs = '%(jobs)s', # Number of concurrent jobs. - timeout = 20, # Timeout if no activity seen (minutes). - make = 'make', # Make command. - enable_shared = False, # Enable shared (--enable-shared configure parameters added) if true. - enable_targets = None, # List of enabled targets (--enable-targets configure param). - defaultBranch = 'trunk', # Branch to build. - llvmgccdir = None, # Path to llvm-gcc. - config_name = 'Debug+Asserts', # Configuration name. - env = {}, # Environmental variables for all steps. - extra_configure_args = []): # Extra args for the conigure step. - # Prepare environmental variables. Set here all env we want everywhere. - merged_env = { - 'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences. - } - if env is not None: - merged_env.update(env) # Overwrite pre-set items with the given ones, so user can set anything. - - llvm_srcdir = "llvm.src" - llvm_objdir = "llvm.obj" - - f = buildbot.process.factory.BuildFactory() - - # Determine the build directory. - f.addStep( - buildbot.steps.shell.SetProperty( - name = "get_builddir", - command = ["pwd"], - property = "builddir", - description = "set build dir", - workdir = ".", - env = merged_env)) - - # Checkout sources. - f.addStep( - SVN( - name = 'svn-llvm', - mode = 'update', baseURL='http://llvm.org/svn/llvm-project/llvm/', - defaultBranch = defaultBranch, - workdir = llvm_srcdir)) - - # Force without llvm-gcc so we don't run afoul of Frontend test failures. - configure_args = [WithProperties("%%(builddir)s/%s/configure" % llvm_srcdir)] - if llvmgccdir: - configure_args += ['--with-llvmgccdir=%s' % llvmgccdir] - else: - configure_args += ["--without-llvmgcc", "--without-llvmgxx"] - configure_args += getConfigArgs(config_name) - if enable_targets is not None: - configure_args.append('--enable-targets=%s' % enable_targets) - if triple: - configure_args += ['--build=%s' % triple, - '--host=%s' % triple, - '--target=%s' % triple] - if enable_shared: - configure_args.append('--enable-shared') - configure_args.extend(extra_configure_args) - f.addStep( - Configure( - command = configure_args, - description = ['configuring', config_name], - descriptionDone = ['configure', config_name], - workdir = llvm_objdir, - env = merged_env)) - if clean: - f.addStep( - WarningCountingShellCommand( - name = "clean-llvm", - command = [make, 'clean'], - haltOnFailure = True, - description = "cleaning llvm", - descriptionDone = "clean llvm", - workdir = llvm_objdir, - env = merged_env)) - f.addStep( - WarningCountingShellCommand( - name = "compile", - command = ['nice', '-n', '10', - make, WithProperties("-j%s" % jobs)], - haltOnFailure = True, - description = "compiling llvm", - descriptionDone = "compile llvm", - workdir = llvm_objdir, - env = merged_env, - timeout = timeout * 60)) - if examples: - f.addStep( - WarningCountingShellCommand( - name = "compile.examples", - command = ['nice', '-n', '10', - make, WithProperties("-j%s" % jobs), - 'BUILD_EXAMPLES=1'], - haltOnFailure = True, - description = ["compiling", "llvm", "examples"], - descriptionDone = ["compile", "llvm", "examples"], - workdir = llvm_objdir, - env = merged_env, - timeout = timeout * 60)) - if test: - litTestArgs = '-v -j %s' % jobs - if valgrind: - litTestArgs += ' --vg ' - if valgrindLeakCheck: - litTestArgs += ' --vg-leak' - if valgrindSuppressions is not None: - litTestArgs += ' --vg-arg --suppressions=%%(builddir)s/llvm/%s' % valgrindSuppressions - f.addStep( - LitTestCommand( - name = 'test-llvm', - command = [make, "check-lit", "VERBOSE=1", - WithProperties("LIT_ARGS=%s" % litTestArgs)], - description = ["testing", "llvm"], - descriptionDone = ["test", "llvm"], - workdir = llvm_objdir, - env = merged_env)) - return f - -def getLLVMCMakeBuildFactory( clean = True, # "clean-llvm" step is requested if true. test = True, # "test-llvm" step is requested if true. jobs = '%(jobs)s', # Number of concurrent jobs.