[llvm-commits] [zorg] r107762 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py lnt/docs/tests.rst lnt/lnt/tests/nt.py zorg/buildbot/builders/ClangBuilder.py zorg/buildbot/builders/LLVMBuilder.py zorg/buildbot/builders/LLVMGCCBuilder.py zorg/buildbot/builders/Util.py
Duncan Sands
baldrick at free.fr
Wed Jul 7 01:30:06 PDT 2010
Author: baldrick
Date: Wed Jul 7 03:30:06 2010
New Revision: 107762
URL: http://llvm.org/viewvc/llvm-project?rev=107762&view=rev
Log:
Update the buildbot scripts for name changes Release->Release+Asserts,
Release-Asserts->Release; Debug->Debug+Asserts, Debug-Asserts->Debug.
Someone will need to restart them though.
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/lnt/docs/tests.rst
zorg/trunk/lnt/lnt/tests/nt.py
zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py
zorg/trunk/zorg/buildbot/builders/Util.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=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Jul 7 03:30:06 2010
@@ -153,7 +153,7 @@
'slavenames' :["dunbar-darwin10"],
'builddir' :"clang-i686-darwin10",
'factory': ClangBuilder.getClangBuildFactory(triple='i686-apple-darwin10',
- stage1_config='Release-Asserts')},
+ stage1_config='Release')},
{'name': "clang-i686-freebsd",
'slavenames':["freebsd1"],
'builddir':"clang-i686-freebsd",
@@ -173,22 +173,22 @@
'builddir' : "clang-x86_64-darwin10-selfhost",
'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10',
useTwoStage=True,
- stage1_config='Release',
- stage2_config='Debug')},
+ stage1_config='Release+Asserts',
+ stage2_config='Debug+Asserts')},
{'name' : "clang-x86_64-linux-selfhost-rel",
'slavenames' : ["osu7"],
'builddir' : "clang-x86_64-linux-selfhost-rel",
'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-pc-linux-gnu',
useTwoStage=True,
- stage1_config='Release',
- stage2_config='Release')},
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts')},
{'name' : "clang-i686-linux-fnt",
'slavenames' : ['balint1'],
'builddir' : "clang-i686-linux-fnt",
'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='i686-pc-linux-gnu',
- stage1_config='Release',
+ stage1_config='Release+Asserts',
test=False,
xfails=clang_i386_linux_xfails) },
@@ -196,7 +196,7 @@
'slavenames' : ['osu7'],
'builddir' : "clang-x86_64-linux-fnt",
'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-pc-linux-gnu',
- stage1_config='Release',
+ stage1_config='Release+Asserts',
test=False,
xfails=clang_x86_64_linux_xfails) },
]
@@ -250,16 +250,16 @@
'builddir' : "clang-i386-darwin10-selfhost-rel",
'factory' : ClangBuilder.getClangBuildFactory(triple='i386-apple-darwin10',
useTwoStage=True,
- stage1_config='Release',
- stage2_config='Release'),
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts'),
'category' : 'clang.exp' },
{'name' : "clang-x86_64-darwin10-selfhost-rel",
'slavenames' : ["dunbar-darwin10"],
'builddir' : "clang-x86_64-darwin10-selfhost-rel",
'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-apple-darwin10',
useTwoStage=True,
- stage1_config='Release',
- stage2_config='Release'),
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts'),
'category' : 'clang.exp' },
{'name' : "llvm-gcc-x86_64-linux-selfhost",
@@ -456,8 +456,8 @@
'builddir' : "clang-i686-linux-selfhost-rel",
'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-linux-gnu',
useTwoStage=True,
- stage1_config='Release',
- stage2_config='Release'),
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts'),
'category' : 'clang.exp' },
{'name' : "clang-i686-xp-msvc9_alt",
@@ -471,8 +471,8 @@
'builddir':"clang-i686-freebsd-selfhost-rel",
'factory': ClangBuilder.getClangBuildFactory(triple='i686-pc-freebsd',
useTwoStage=True,
- stage1_config='Release',
- stage2_config='Release'),
+ stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts'),
'category' : 'clang.exp' },
]
@@ -507,5 +507,5 @@
{'name': "clang-x86_64-linux-checks",
'slavenames':["osu2"],
'builddir':"clang-x86_64-linux-checks",
- 'factory': ClangBuilder.getClangBuildFactory(stage1_config='Debug+Checks'),
+ 'factory': ClangBuilder.getClangBuildFactory(stage1_config='Debug+Asserts+Checks'),
'category':'clang.exp'}
Modified: zorg/trunk/lnt/docs/tests.rst
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/docs/tests.rst?rev=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/lnt/docs/tests.rst (original)
+++ zorg/trunk/lnt/docs/tests.rst Wed Jul 7 03:30:06 2010
@@ -72,9 +72,9 @@
The ``nt`` test requires that the LLVM test-suite repository, a working LLVM
compiler, and a LLVM source and build tree are available. Currently, the LLVM
-build tree is expected to have been built-in the Release configuration. Unlike
-the prior ``NewNightlyTest.pl``, the ``nt`` tool does not checkout or build any
-thing, it is expected that users manage their own LLVM source and build
+build tree is expected to have been built-in the Release+Asserts configuration.
+Unlike the prior ``NewNightlyTest.pl``, the ``nt`` tool does not checkout or build
+any thing, it is expected that users manage their own LLVM source and build
trees. Ideally, each of the components should be based on the same LLVM revision
(except perhaps the LLVM test-suite), but this is not required.
@@ -97,8 +97,8 @@
$ rm -rf /tmp/BAR
$ lnt runtest nt \
--sandbox /tmp/BAR \
- --cc ~/llvm.obj.64/Release/bin/clang \
- --cxx ~/llvm.obj.64/Release/bin/clang++ \
+ --cc ~/llvm.obj.64/Release+Asserts/bin/clang \
+ --cxx ~/llvm.obj.64/Release+Asserts/bin/clang++ \
--llvm-src ~/llvm \
--llvm-obj ~/llvm.obj.64 \
--test-suite ~/llvm-test-suite \
Modified: zorg/trunk/lnt/lnt/tests/nt.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/nt.py?rev=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/nt.py (original)
+++ zorg/trunk/lnt/lnt/tests/nt.py Wed Jul 7 03:30:06 2010
@@ -66,8 +66,9 @@
else:
fatal('invalid build mode: %r' % opts.build_mode)
+ make_variables['DISABLE_ASSERTIONS'] = '1'
while build_mode:
- for (name,key) in (('-Asserts', 'DISABLE_ASSERTIONS'),
+ for (name,key) in (('+Asserts', 'ENABLE_ASSERTIONS'),
('+Checks', 'ENABLE_EXPENSIVE_CHECKS'),
('+Coverage', 'ENABLE_COVERAGE'),
('+Debug', 'DEBUG_SYMBOLS'),
Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jul 7 03:30:06 2010
@@ -18,7 +18,7 @@
valgrindLeakCheck=False, outOfDir=False, useTwoStage=False,
completely_clean=False, always_install=False,
make='make', jobs="%(jobs)s",
- stage1_config='Debug', stage2_config='Release',
+ stage1_config='Debug+Asserts', stage2_config='Release+Asserts',
extra_configure_args=[], use_pty_in_tests=False):
# Don't use in-dir builds with a two stage build process.
inDir = not outOfDir and not useTwoStage
Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Wed Jul 7 03:30:06 2010
@@ -31,7 +31,7 @@
# Force without llvm-gcc so we don't run afoul of Frontend test failures.
configure_args = ["./configure", "--without-llvmgcc", "--without-llvmgxx"]
- config_name = 'Debug'
+ config_name = 'Debug+Asserts'
if expensive_checks:
configure_args.append('--enable-expensive-checks')
config_name += '+Checks'
Modified: zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py?rev=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py Wed Jul 7 03:30:06 2010
@@ -11,8 +11,8 @@
def getLLVMGCCBuildFactory(jobs='%(jobs)s', update=True, clean=True,
gxxincludedir=None,
triple=None, build=None, host=None, target=None,
- useTwoStage=True, stage1_config='Release',
- stage2_config='Release', make='make',
+ useTwoStage=True, stage1_config='Release+Asserts',
+ stage2_config='Release+Asserts', make='make',
extra_configure_args=[], verbose=False, env = {},
defaultBranch='trunk'):
if build or host or target:
Modified: zorg/trunk/zorg/buildbot/builders/Util.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Util.py?rev=107762&r1=107761&r2=107762&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Util.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Util.py Wed Jul 7 03:30:06 2010
@@ -9,9 +9,10 @@
else:
raise ValueError,'Unknown config name: %r' % origname
- if name.startswith('-Asserts'):
- name = name[len('-Asserts'):]
- args.append('--disable-assertions')
+ args.append('--disable-assertions')
+ if name.startswith('+Asserts'):
+ name = name[len('+Asserts'):]
+ args.append('--enable-assertions')
if name.startswith('+Checks'):
name = name[len('+Checks'):]
More information about the llvm-commits
mailing list