[zorg] r230815 - Fix buildbot fallout from disabling in-source autotools builds
Jonathan Roelofs
jonathan at codesourcery.com
Fri Feb 27 16:03:18 PST 2015
Author: jroelofs
Date: Fri Feb 27 18:03:17 2015
New Revision: 230815
URL: http://llvm.org/viewvc/llvm-project?rev=230815&view=rev
Log:
Fix buildbot fallout from disabling in-source autotools builds
... which happened in r230812.
http://reviews.llvm.org/D7964
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py
zorg/trunk/zorg/buildbot/builders/PollyBuilder.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=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Feb 27 18:03:17 2015
@@ -99,7 +99,6 @@ def _get_llvm_builders():
'slavenames':["aarch64-foundation"],
'builddir':"llvm-aarch64-linux",
'factory': LLVMBuilder.getLLVMBuildFactory(config_name='Release+Asserts',
- outOfDir=True,
extra_configure_args=["--host=aarch64-linux-gnu"])},
{'name': "llvm-hexagon-elf",
'slavenames':["hexagon-build-03"],
@@ -174,8 +173,7 @@ def _get_clang_fast_builders():
env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'},
stage1_config='Release+Asserts',
- checkout_compiler_rt=True,
- outOfDir=True)},
+ checkout_compiler_rt=True)},
{'name': "llvm-clang-lld-x86_64-debian-fast",
'slavenames':["gribozavr4"],
@@ -420,7 +418,7 @@ def _get_clang_builders():
{'name' : "clang-x86_64-darwin13-cross-mingw32",
'slavenames' :["as-bldslv9"],
'builddir' :"clang-x86_64-darwin13-cross-mingw32",
- 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, use_pty_in_tests=True,
+ 'factory' : ClangBuilder.getClangBuildFactory(use_pty_in_tests=True,
test=False,
env = { 'CC' : 'clang',
'CXX' : 'clang++',
@@ -432,7 +430,7 @@ def _get_clang_builders():
{'name' : "clang-x86_64-darwin13-cross-arm",
'slavenames' :["as-bldslv9"],
'builddir' :"clang-x86_64-darwin13-cross-arm",
- 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, use_pty_in_tests=True,
+ 'factory' : ClangBuilder.getClangBuildFactory(use_pty_in_tests=True,
env = { 'CC' : 'clang',
'CXX' : 'clang++',
'CXXFLAGS' : '-stdlib=libc++'},
@@ -560,7 +558,7 @@ def _get_clang_builders():
{'name' : "clang-x86_64-darwin11-cross-linux-gnu",
'slavenames' :["as-bldslv11"],
'builddir' :"clang-x86_64-darwin11-cross-linux-gnu",
- 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, use_pty_in_tests=True,
+ 'factory' : ClangBuilder.getClangBuildFactory(jobs=4, use_pty_in_tests=True,
run_cxx_tests=True,
extra_configure_args=['--build=x86_64-apple-darwin11',
'--host=x86_64-apple-darwin11',
@@ -586,7 +584,7 @@ def _get_clang_builders():
{'name': "clang-x86_64-darwin11-self-mingw32",
'slavenames':["as-bldslv11"],
'builddir':"clang-x86_64-darwin11-self-mingw32",
- 'factory' : ClangBuilder.getClangBuildFactory(outOfDir=True, jobs=4, test=False,
+ 'factory' : ClangBuilder.getClangBuildFactory(jobs=4, test=False,
env = { 'PATH' : "/mingw_build_tools/install_with_gcc/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin",
'CC' : 'clang',
'CXX' : 'clang++',
Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri Feb 27 18:03:17 2015
@@ -24,7 +24,6 @@ def getClangBuildFactory(
examples=False,
valgrind=False,
valgrindLeakCheck=False,
- outOfDir=False,
useTwoStage=False,
completely_clean=False,
make='make',
@@ -55,21 +54,11 @@ def getClangBuildFactory(
# Overwrite pre-set items with the given ones, so user can set anything.
merged_env.update(env)
- if run_gdb or run_gcc or run_modern_gdb:
- outOfDir = True
-
- # Don't use in-dir builds with a two stage build process.
- inDir = not outOfDir and not useTwoStage
- if inDir:
- llvm_srcdir = "llvm"
- llvm_1_objdir = "llvm"
- llvm_1_installdir = None
- else:
- llvm_srcdir = "llvm.src"
- llvm_1_objdir = "llvm.obj"
- llvm_1_installdir = "llvm.install.1"
- llvm_2_objdir = "llvm.obj.2"
- llvm_2_installdir = "llvm.install"
+ llvm_srcdir = "llvm.src"
+ llvm_1_objdir = "llvm.obj"
+ llvm_1_installdir = "llvm.install.1"
+ llvm_2_objdir = "llvm.obj.2"
+ llvm_2_installdir = "llvm.install"
f = buildbot.process.factory.BuildFactory()
Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri Feb 27 18:03:17 2015
@@ -139,7 +139,6 @@ def getLLDBWindowsCMakeBuildFactory(
def getLLDBBuildFactory(
triple,
- outOfDir=False,
useTwoStage=False,
make='make',
jobs='%(jobs)s',
@@ -148,13 +147,8 @@ def getLLDBBuildFactory(
*args,
**kwargs):
- inDir = not outOfDir and not useTwoStage
- if inDir:
- llvm_srcdir = "llvm"
- llvm_objdir = "llvm"
- else:
- llvm_srcdir = "llvm.src"
- llvm_objdir = "llvm.obj"
+ llvm_srcdir = "llvm.src"
+ llvm_objdir = "llvm.obj"
f = buildbot.process.factory.BuildFactory()
Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Fri Feb 27 18:03:17 2015
@@ -29,8 +29,7 @@ def getLLVMBuildFactory(
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.
- outOfDir = False): # Enable out-of-dir build (for cross-compile builds).
+ 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.
@@ -38,12 +37,8 @@ def getLLVMBuildFactory(
if env is not None:
merged_env.update(env) # Overwrite pre-set items with the given ones, so user can set anything.
- if outOfDir:
- llvm_srcdir = "llvm.src"
- llvm_objdir = "llvm.obj"
- else:
- llvm_srcdir = "llvm"
- llvm_objdir = "llvm"
+ llvm_srcdir = "llvm.src"
+ llvm_objdir = "llvm.obj"
f = buildbot.process.factory.BuildFactory()
Modified: zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LNTBuilder.py?rev=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LNTBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LNTBuilder.py Fri Feb 27 18:03:17 2015
@@ -49,7 +49,7 @@ def getLNTFactory(triple, nt_flags, xfai
# Build compiler to test.
f = ClangBuilder.getClangBuildFactory(
- triple, outOfDir=True, clean=clean, test=test,
+ triple, clean=clean, test=test,
stage1_config='Release+Asserts', **kwargs)
# Add an LNT test runner.
Modified: zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py?rev=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/NightlytestBuilder.py Fri Feb 27 18:03:17 2015
@@ -60,7 +60,7 @@ def getNightlytestBuildFactory(submitAux
def getFastNightlyTestBuildFactory(triple, xfails=[], clean=True, test=False, make='make', **kwargs):
# Build compiler to test.
f = ClangBuilder.getClangBuildFactory(
- triple, outOfDir=True, clean=clean, test=test,
+ triple, clean=clean, test=test,
make=make, **kwargs)
# Prepare environmental variables. Set here all env we want everywhere.
Modified: zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/PollyBuilder.py?rev=230815&r1=230814&r2=230815&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Fri Feb 27 18:03:17 2015
@@ -139,7 +139,7 @@ def getPollyLNTFactory(triple, nt_flags,
llvm_install_dir = 'llvm.install.1'
f = ClangBuilder.getClangBuildFactory(
- triple, outOfDir=True, clean=clean, test=test,
+ triple, clean=clean, test=test,
stage1_config='Release+Asserts', **kwargs)
f.addStep(ShellCommand(name="install-llvm-and-clang",
More information about the llvm-commits
mailing list