[zorg] r194758 - Patch by Rick Foos!
Galina Kistanova
gkistanova at gmail.com
Thu Nov 14 17:22:49 PST 2013
Author: gkistanova
Date: Thu Nov 14 19:22:49 2013
New Revision: 194758
URL: http://llvm.org/viewvc/llvm-project?rev=194758&view=rev
Log:
Patch by Rick Foos!
Added a new buildslave, hexagon-build-03, and a few modifications stabilize the sanitizer on the server.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/config/slaves.py
zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.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=194758&r1=194757&r2=194758&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Nov 14 19:22:49 2013
@@ -623,6 +623,12 @@ def _get_sanitizer_builders():
'slavenames' :["sanitizer-buildbot2"],
'builddir': "sanitizer-x86_64-linux-bootstrap",
'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+ {'name': "llvm-clang-lld-x86_64-ubuntu-13.04-sanitize-address",
+ 'slavenames':["hexagon-build-03"],
+ 'builddir':"llvm-clang-lld-x86_64-ubuntu-13.04-fsanitize-address",
+ 'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(Option='-fsanitize=address',
+ env={'PATH':'/opt/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games'},
+ jobs=12,loadaverage=32)},
]
# Experimental and stopped builders
Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=194758&r1=194757&r2=194758&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Thu Nov 14 19:22:49 2013
@@ -188,7 +188,11 @@ def get_build_slaves():
create_slave("osu8", properties={'jobs' : 6}, max_builds=2),
# Ubuntu 12.04 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
- create_slave("hexagon-build-02", properties={'jobs': 12}, max_builds=4),
+ create_slave("hexagon-build-02", properties={'jobs': 12, 'loadaverage': 32},
+ max_builds=4),
+ # Ubuntu 13.04 x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
+ create_slave("hexagon-build-03", properties={'jobs': 16, 'loadaverage': 32},
+ max_builds=2),
# Cavium Octeon II V0.8, MIPS64 big endian, Debian squeeze (6.0.6)
create_slave("mipsswbrd002", properties={'jobs' : 6}, max_builds=1),
Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=194758&r1=194757&r2=194758&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Thu Nov 14 19:22:49 2013
@@ -10,7 +10,10 @@ from zorg.buildbot.commands.LitTestComma
def getClangAndLLDBuildFactory(
clean=True,
- env=None):
+ Option=None,
+ env=None,
+ jobs="%(jobs)s",
+ loadaverage="%(loadaverage)s"):
llvm_srcdir = "llvm.src"
llvm_objdir = "llvm.obj"
@@ -38,11 +41,11 @@ def getClangAndLLDBuildFactory(
baseURL='http://llvm.org/svn/llvm-project/llvm/',
defaultBranch='trunk',
workdir=llvm_srcdir))
- f.addStep(SVN(name='svn-compiler-rt',
- mode='update',
- baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
- defaultBranch='trunk',
- workdir='%s/projects/compiler-rt' % llvm_srcdir))
+ #f.addStep(SVN(name='svn-compiler-rt',
+ # mode='update',
+ # baseURL='http://llvm.org/svn/llvm-project/compiler-rt/',
+ # defaultBranch='trunk',
+ # workdir='%s/projects/compiler-rt' % llvm_srcdir))
f.addStep(SVN(name='svn-clang',
mode='update',
baseURL='http://llvm.org/svn/llvm-project/cfe/',
@@ -75,14 +78,23 @@ def getClangAndLLDBuildFactory(
description=["create build dir"],
workdir=".",
env=merged_env))
+
+ options = "-std=c++11 -Wdocumentation -Wno-documentation-deprecated-sync "
+
+ if (Option is not None):
+ options += Option
+
cmakeCommand = [
"cmake",
"-DCMAKE_BUILD_TYPE=Release",
"-DLLVM_ENABLE_ASSERTIONS=ON",
- "-DCMAKE_CXX_FLAGS=\"-std=c++11 -Wdocumentation -Wno-documentation-deprecated-sync\"",
+ "-DCMAKE_C_COMPILER=clang",
+ "-DCMAKE_CXX_COMPILER=clang++",
+ "-DCMAKE_CXX_FLAGS=\"%s\"" %(options),
"-DLLVM_LIT_ARGS=\"-v\"",
"-G", "Ninja",
- "../%s" % llvm_srcdir]
+ "../%s" %(llvm_srcdir)]
+
# Note: ShellCommand does not pass the params with special symbols right.
# The " ".join is a workaround for this bug.
f.addStep(ShellCommand(name="cmake-configure",
@@ -94,7 +106,9 @@ def getClangAndLLDBuildFactory(
# Build everything.
f.addStep(WarningCountingShellCommand(name="build",
- command=["nice", "-n", "10", "ninja"],
+ command=["ninja",
+ "-j %s" %(jobs),
+ "-l %s" %(loadaverage)],
haltOnFailure=True,
description=["build"],
workdir=llvm_objdir,
@@ -102,7 +116,10 @@ def getClangAndLLDBuildFactory(
# Test everything.
f.addStep(LitTestCommand(name="test",
- command=["nice", "-n", "10", "ninja", "check-all"],
+ command=["ninja",
+ "-j %s" %(jobs),
+ "-l %s" %(loadaverage),
+ "check-all"],
haltOnFailure=True,
description=["test"],
workdir=llvm_objdir,
More information about the llvm-commits
mailing list