[llvm-commits] [zorg] r101730 - in /zorg/trunk: buildbot/osuosl/master/ buildbot/osuosl/master/config/builders.py buildbot/osuosl/master/config/slaves.py buildbot/osuosl/master/config/status.py zorg/buildbot/commands/NightlyTestCommand.py
Daniel Dunbar
daniel at zuster.org
Sun Apr 18 12:14:07 PDT 2010
Author: ddunbar
Date: Sun Apr 18 14:14:07 2010
New Revision: 101730
URL: http://llvm.org/viewvc/llvm-project?rev=101730&view=rev
Log:
buildbot: Add a variety of builders.
- Move llvm-*-vg to vg_leak builds, now that the leaks have been fixed by a few heros.
- Add two "fast nightly test" (-fnt) builders.
- Add a dragonegg i386 builder.
- Add a new Debian build slave.
Modified:
zorg/trunk/buildbot/osuosl/master/ (props changed)
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/config/slaves.py
zorg/trunk/buildbot/osuosl/master/config/status.py
zorg/trunk/zorg/buildbot/commands/NightlyTestCommand.py
Propchange: zorg/trunk/buildbot/osuosl/master/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 18 14:14:07 2010
@@ -1,5 +1,6 @@
llvm-*
clang-*
+dragonegg-*
twistd.pid
twistd.log*
notify.pickle
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=101730&r1=101729&r2=101730&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sun Apr 18 14:14:07 2010
@@ -1,7 +1,22 @@
-from zorg.buildbot.builders import ClangBuilder, LLVMBuilder, LLVMGCCBuilder
+from zorg.buildbot.builders import ClangBuilder
+reload(ClangBuilder)
+from zorg.buildbot.builders import ClangBuilder
+
+from zorg.buildbot.builders import LLVMBuilder
reload(LLVMBuilder)
-from zorg.buildbot.builders import ClangBuilder, LLVMBuilder, LLVMGCCBuilder
+from zorg.buildbot.builders import LLVMBuilder
+
+from zorg.buildbot.builders import LLVMGCCBuilder
+reload(LLVMGCCBuilder)
+from zorg.buildbot.builders import LLVMGCCBuilder
+
from zorg.buildbot.builders import DragonEggBuilder
+reload(DragonEggBuilder)
+from zorg.buildbot.builders import DragonEggBuilder
+
+from zorg.buildbot.builders import NightlytestBuilder
+reload(NightlytestBuilder)
+from zorg.buildbot.builders import NightlytestBuilder
# Plain LLVM builders.
def _get_llvm_builders():
@@ -23,16 +38,16 @@
'builddir':"llvm-arm-linux",
'factory': LLVMBuilder.getLLVMBuildFactory("arm-pc-linux-gnu", jobs=1, clean=False,
timeout=40)},
- {'name': "llvm-i686-linux-vg",
+ {'name': "llvm-i686-linux-vg_leak",
'slavenames':["osu8"],
- 'builddir':"llvm-i686-linux-vg",
- 'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", valgrind=True),
- 'category':'llvm.exp'},
- {'name': "llvm-x86_64-linux-vg",
+ 'builddir':"llvm-i686-linux-vg_leak",
+ 'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", valgrind=True,
+ valgrindLeakCheck=True)},
+ {'name': "llvm-x86_64-linux-vg_leak",
'slavenames':["osu7"],
- 'builddir':"llvm-x86_64-linux-vg",
- 'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", valgrind=True),
- 'category':'llvm.exp'},
+ 'builddir':"llvm-x86_64-linux-vg_leak",
+ 'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", valgrind=True,
+ valgrindLeakCheck=True)},
]
# Offline.
@@ -66,6 +81,67 @@
'builddir':"llvm-x86_64-linux-checks",
'factory':LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", jobs=10, expensive_checks=True)}
+
+clang_i386_linux_xfails = [
+ 'GCCAS.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'GCCAS.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'GCCAS.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'Bytecode.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'Bytecode.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'Bytecode.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'LLC.MultiSource/Applications/oggenc/oggenc',
+ 'LLC.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'LLC.MultiSource/Benchmarks/VersaBench/bmm/bmm',
+ 'LLC.MultiSource/Benchmarks/VersaBench/dbms/dbms',
+ 'LLC.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'LLC.SingleSource/Benchmarks/Misc-C++/oopack_v1p8',
+ 'LLC.SingleSource/Benchmarks/Misc-C++/sphereflake',
+ 'LLC.SingleSource/Regression/C++/EH/ConditionalExpr',
+ 'LLC.SingleSource/Regression/C++/EH/ctor_dtor_count-2',
+ 'LLC.SingleSource/Regression/C++/EH/function_try_block',
+ 'LLC.SingleSource/Regression/C++/EH/simple_rethrow',
+ 'LLC.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'LLC_compile.MultiSource/Applications/oggenc/oggenc',
+ 'LLC_compile.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'LLC_compile.MultiSource/Benchmarks/VersaBench/bmm/bmm',
+ 'LLC_compile.MultiSource/Benchmarks/VersaBench/dbms/dbms',
+ 'LLC_compile.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'LLC_compile.SingleSource/Benchmarks/Misc-C++/oopack_v1p8',
+ 'LLC_compile.SingleSource/Benchmarks/Misc-C++/sphereflake',
+ 'LLC_compile.SingleSource/Regression/C++/EH/ConditionalExpr',
+ 'LLC_compile.SingleSource/Regression/C++/EH/ctor_dtor_count-2',
+ 'LLC_compile.SingleSource/Regression/C++/EH/function_try_block',
+ 'LLC_compile.SingleSource/Regression/C++/EH/simple_rethrow',
+ 'LLC_compile.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+]
+
+clang_x86_64_linux_xfails = [
+ 'GCCAS.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'GCCAS.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'GCCAS.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'Bytecode.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'Bytecode.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'Bytecode.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'LLC.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'LLC.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'LLC.SingleSource/Regression/C++/EH/ConditionalExpr',
+ 'LLC.SingleSource/Regression/C++/EH/ctor_dtor_count-2',
+ 'LLC.SingleSource/Regression/C++/EH/function_try_block',
+ 'LLC.SingleSource/Regression/C++/EH/simple_rethrow',
+ 'LLC.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'LLC.SingleSource/UnitTests/Vector/SSE/sse.expandfft',
+ 'LLC.SingleSource/UnitTests/Vector/SSE/sse.stepfft',
+ 'LLC_compile.MultiSource/Benchmarks/Prolangs-C/archie-client/archie',
+ 'LLC_compile.MultiSource/Benchmarks/tramp3d-v4/tramp3d-v4',
+ 'LLC_compile.SingleSource/Regression/C++/EH/ConditionalExpr',
+ 'LLC_compile.SingleSource/Regression/C++/EH/ctor_dtor_count-2',
+ 'LLC_compile.SingleSource/Regression/C++/EH/function_try_block',
+ 'LLC_compile.SingleSource/Regression/C++/EH/simple_rethrow',
+ 'LLC_compile.SingleSource/UnitTests/2006-12-04-DynAllocAndRestore',
+ 'LLC_compile.SingleSource/UnitTests/Vector/SSE/sse.expandfft',
+ 'LLC_compile.SingleSource/UnitTests/Vector/SSE/sse.stepfft',
+]
+
# Clang builders.
def _get_clang_builders():
return [
@@ -103,6 +179,22 @@
useTwoStage=True,
stage1_config='Release',
stage2_config='Debug')},
+
+ {'name' : "clang-i686-linux-fnt",
+ 'slavenames' : ['balint1'],
+ 'builddir' : "clang-i686-linux-fnt",
+ 'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='i686-pc-linux-gnu',
+ stage1_config='Release',
+ test=False,
+ xfails=clang_i386_linux_xfails) },
+
+ {'name' : "clang-x86_64-linux-fnt",
+ 'slavenames' : ['osu7'],
+ 'builddir' : "clang-x86_64-linux-fnt",
+ 'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-pc-linux-gnu',
+ stage1_config='Release',
+ test=False,
+ xfails=clang_x86_64_linux_xfails) },
]
# Offline.
@@ -112,8 +204,23 @@
'factory': ClangBuilder.getClangBuildFactory("i386-pc-auroraux",
jobs="%(jobs)s", make='gmake')},
+def _get_dragonegg_builders():
+ return [
+ {'name' : 'dragonegg-i386-linux',
+ 'slavenames' : ['baldrick16'],
+ 'builddir' : 'dragonegg-i386-linux',
+ 'factory' : DragonEggBuilder.getBuildFactory(triple='i386-pc-linux-gnu',
+ build_script='buildbot_self_strap-32') },
+
+ {'name' : 'dragonegg-x86_64-linux',
+ 'slavenames' : ['baldrick15', 'baldrick17'],
+ 'builddir' : 'dragonegg-x86_64-linux',
+ 'factory' : DragonEggBuilder.getBuildFactory(triple='x86_64-pc-linux-gnu'), },
+ ]
+
def _get_experimental_builders():
return [
+
{'name' : "llvm-gcc-x86_64-darwin10-cross-mingw32",
'slavenames':["kistanova1"],
'builddir': "llvm-gcc-x86_64-darwin10-cross-mingw32",
@@ -164,11 +271,11 @@
stage2_config='Release'),
'category' : 'clang.exp' },
- {'name' : 'dragonegg-x86_64-linux',
- 'slavenames' : ['baldrick16'],
- 'builddir' : 'dragonegg-x86_64-linux',
- 'factory' : DragonEggBuilder.getBuildFactory(triple='x86_64-pc-linux-gnu'),
- 'category' : 'dragonegg.exp' },
+ {'name' : "clang-i686-xp-msvc9_alt",
+ 'slavenames' :['adobe1'],
+ 'builddir' :"clang-i686-xp-msvc9_alt",
+ 'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2),
+ 'category' : 'clang.exp' },
]
@@ -181,10 +288,14 @@
b['category'] = 'llvm-gcc'
yield b
+ for b in _get_dragonegg_builders():
+ b['category'] = 'dragonegg'
+ yield b
+
for b in _get_clang_builders():
b['category'] = 'clang'
yield b
-
+
for b in _get_experimental_builders():
yield b
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=101730&r1=101729&r2=101730&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Sun Apr 18 14:14:07 2010
@@ -62,6 +62,9 @@
create_slave("osu7", properties={'jobs' : 10}, max_builds=4),
create_slave("osu8", properties={'jobs' : 10}, max_builds=4),
+ # Debian, P4 2.8GHz, 1GB mem
+ create_slave("balint1", properties={'jobs' : 1}, max_builds=1),
+
# Defunct.
#create_slave("osu2", properties={'jobs' : 4}, max_builds=2),
#create_slave("andrew1"),
Modified: zorg/trunk/buildbot/osuosl/master/config/status.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/status.py?rev=101730&r1=101729&r2=101730&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Sun Apr 18 14:14:07 2010
@@ -11,7 +11,7 @@
default_email = config.options.get('Master Options', 'default_email')
return [
buildbot.status.html.WebStatus(
- http_port = 8011, allowForce = False),
+ http_port = 8011, allowForce = True),
buildbot.status.mail.MailNotifier(
fromaddr = "buildbot at google1.osuosl.org",
extraRecipients = [default_email],
Modified: zorg/trunk/zorg/buildbot/commands/NightlyTestCommand.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/commands/NightlyTestCommand.py?rev=101730&r1=101729&r2=101730&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/commands/NightlyTestCommand.py (original)
+++ zorg/trunk/zorg/buildbot/commands/NightlyTestCommand.py Sun Apr 18 14:14:07 2010
@@ -12,7 +12,7 @@
buildbot.steps.shell.Test.__init__(self, *args, **kwargs)
self.expectedFailures = set(xfails)
- self.addFactoryArguments(xfails=xfails)
+ self.addFactoryArguments(xfails=list(xfails))
def evaluateCommand(self, cmd):
# Always fail if the command itself failed.
More information about the llvm-commits
mailing list