[zorg] r230825 - Add Darwin 13.4 x86_64 builder
Ying Chen
chying at google.com
Fri Feb 27 16:40:40 PST 2015
Author: chying
Date: Fri Feb 27 18:40:39 2015
New Revision: 230825
URL: http://llvm.org/viewvc/llvm-project?rev=230825&view=rev
Log:
Add Darwin 13.4 x86_64 builder
Summary: Add Darwin 13.4 x86_64 builder and slave
Test Plan:
Create bulidbot master on local workstation
Create slave and connect to local master
Monitor the build status with check-ins
Reviewers: sivachandra, ovyalov, chaoren
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D7896
Modified:
zorg/trunk/buildbot/osuosl/master/config/builders.py
zorg/trunk/buildbot/osuosl/master/config/slaves.py
zorg/trunk/zorg/buildbot/builders/LLDBBuilder.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=230825&r1=230824&r2=230825&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Feb 27 18:40:39 2015
@@ -714,6 +714,10 @@ def _get_lldb_builders():
test_compiler="clang",
build_type="Debug",
env={'SHELL':"/bin/bash"})},
+ {'name': "lldb-x86_64-darwin-13.4",
+ 'slavenames': ["lldb-x86_64-darwin-13.4"],
+ 'builddir': "buildDir",
+ 'factory': LLDBBuilder.getLLDBxcodebuildFactory()},
]
# Offline.
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=230825&r1=230824&r2=230825&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Fri Feb 27 18:40:39 2015
@@ -178,7 +178,8 @@ def get_build_slaves():
create_slave("lldb-build1-ubuntu-1404", properties={'jobs': 16, 'loadaverage':
32},
max_builds=1),
-
+ # Darwin 13.4.0, x86_64
+ create_slave("lldb-x86_64-darwin-13.4", properties={'jobs': 16, 'loadaverage':32}, max_builds=1),
# Defunct.
# Intel(R) Pentium(R) CPU G620 @ 2.60GHz, Ubuntu i686
#create_slave("botether", properties={'jobs': 2}, max_builds=1),
Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=230825&r1=230824&r2=230825&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri Feb 27 18:40:39 2015
@@ -311,6 +311,12 @@ def getLLDBxcodebuildFactory(use_cc=None
workdir='.'))
lldb_srcdir = 'lldb.src'
OBJROOT='%(builddir)s/' + lldb_srcdir + '/build'
+ f.addStep(SetProperty(name='get_bindir',
+ command=['echo',
+ WithProperties('%(builddir)s/' + lldb_srcdir + '/build/Debug')],
+ property='lldb_bindir',
+ description='set bin dir',
+ workdir='.'))
# cleaning out the build directory is vital for codesigning.
f.addStep(ShellCommand(name='clean.lldb-buid',
command=['rm', '-rf', WithProperties(OBJROOT)],
@@ -320,6 +326,10 @@ def getLLDBxcodebuildFactory(use_cc=None
command=['rm', '-rf', '%s/llvm-build' % lldb_srcdir ],
haltOnFailure=True,
workdir=WithProperties('%(builddir)s')))
+ f.addStep(ShellCommand(name='clean.test trace',
+ command=['rm', '-rf', '%s/DerivedData/lldb-test-results' % lldb_srcdir ],
+ haltOnFailure=True,
+ workdir=WithProperties('%(builddir)s')))
f.addStep(SVN(name='svn-lldb',
mode='update',
baseURL='http://llvm.org/svn/llvm-project/lldb/',
@@ -360,6 +370,17 @@ def getLLDBxcodebuildFactory(use_cc=None
'-configuration', 'Debug',
WithProperties('SYMROOT=' + OBJROOT),
WithProperties('OBJROOT=' + OBJROOT)],
+ haltOnFailure=False,
+ workdir=lldb_srcdir))
+
+# Currently the first build always fail, so ignore the first result and add retry as workaround
+
+ f.addStep(ShellCommand(name='lldb-build-Retry',
+ command=['xcrun', 'xcodebuild', '-workspace',
+ 'lldb.xcworkspace', '-scheme', 'lldb-tool',
+ '-configuration', 'Debug',
+ WithProperties('SYMROOT=' + OBJROOT),
+ WithProperties('OBJROOT=' + OBJROOT)],
haltOnFailure=True,
workdir=lldb_srcdir))
# Testing
@@ -379,11 +400,13 @@ def getLLDBxcodebuildFactory(use_cc=None
description='set cc',
workdir=lldb_srcdir))
- f.addStep(ShellCommand(name='lldb-test',
- command=['./dotest.py', '-v', '-C',
- WithProperties('%(use_cc)s')],
- haltOnFailure=True,
- workdir='%s/test' % lldb_srcdir))
+ f.addStep(LitTestCommand(name='lldb-test',
+ command=['./dosep.py',
+ '--options',
+ WithProperties('-m --executable %(lldb_bindir)s/lldb --framework %(lldb_bindir)s/LLDB.framework -A x86_64 -C clang -s ../DerivedData/lldb-test-results')],
+ haltOnFailure=True,
+ workdir='%s/test' % lldb_srcdir,
+ env={'DYLD_FRAMEWORK_PATH' : WithProperties('%(lldb_bindir)s')}))
# Results go in a directory coded named according to the date and time of the test run, e.g.:
#
More information about the llvm-commits
mailing list