[PATCH] Add Darwin 13.4 x86_64 builder
Ying Chen
chying at google.com
Thu Feb 26 18:34:34 PST 2015
Set haltOnFailure=True for second build, use env to export shell environment variable
http://reviews.llvm.org/D7896
Files:
buildbot/osuosl/master/config/builders.py
buildbot/osuosl/master/config/slaves.py
zorg/buildbot/builders/LLDBBuilder.py
Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -703,6 +703,10 @@
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.
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -175,7 +175,8 @@
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),
Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -317,6 +317,12 @@
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)],
@@ -366,6 +372,17 @@
'-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
@@ -385,11 +402,13 @@
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.:
#
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D7896.20817.patch
Type: text/x-patch
Size: 4119 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150227/56cb7a45/attachment.bin>
More information about the llvm-commits
mailing list