Add Darwin 13.4 x86_64 builder

[chying]

Summary

Add Darwin 13.4 x86_64 builder and slave

[chying]

Update LLDBxcodebuildFactory to handle first test failure and lldb symbol not found problem

[sivachandra]

zorg/buildbot/builders/LLDBBuilder.py

386 ↗

(On Diff #20727)

haltOnFailure=True ?

409 ↗

(On Diff #20727)

Isn't there an equivalent of nina/make check-lldb for Darwin?

413 ↗

(On Diff #20727)

Instead of a single string setting the environment and invoking dosep, you can specify the enivorment in kwargs to LiTestCommand. So, you can remove testCmd and have something like this:

f.addStep(LitTestCommand(name='lldb-test',
                         command=[<the list with dosep command args>],
                         haltOnFailure=True,
                         workdir='%s/test' % lldb_srcdir,
                         env={'DYLD_FRAMEWORK_PATH' : WithProperties('%(lldb_bindir)s')}))

Please do test that this works.

[chying]

Set haltOnFailure=True for second build, use env to export shell environment variable

[sivachandra]

LGTM with a nit.

zorg/buildbot/builders/LLDBBuilder.py

408 ↗

(On Diff #20817)

Ah! This should be split into multiple list elements.

[sivachandra]

zorg/buildbot/builders/LLDBBuilder.py

408 ↗

(On Diff #20817)

Ying explained off list that this set of options are actually form a single argument to '--options'. In which case, a more readable approach is probably:

comma=['./dosep.py',
       '--options',
       ' '.join(['-m',
                 '--executable', WithProperties('%(lldb_buildir)s/lldb'),
                 '--framework', WithProperties('%(lldb_bindir)s/LLDB.framework'),
                 '-A', 'x86_64', '-C', 'clang',
                 '-s', '../DerivedData/lldb-test-results'])]

But, I leave it up to Ying. Feel free to submit as is.

[chying]

Add step to clean test trace folder

zorg/trunk/buildbot/osuosl/master/config/builders.py

return [
         {'name': "lldb-x86_64-ubuntu-14.04-cmake",
          'slavenames': ["lldb-build1-ubuntu-1404"],
          'builddir': "buildWorkingDir",
          'factory': LLDBBuilder.getLLDBUbuntuCMakeBuildFactory(
                     build_compiler="clang",
                     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.
 {'name': "lldb-x86_64-linux",
  'slavenames': ["gcc20"],
  'builddir': "lldb-x86_64",
  'factory': LLDBBuilder.getLLDBBuildFactory(triple="x86_64-pc-linux-gnu",
                                             env={'CXXFLAGS' : '-std=c++0x'})},

zorg/trunk/buildbot/osuosl/master/config/slaves.py

32},
         create_slave("sanitizer-windows", properties={'jobs': 4}, max_builds=1),
         # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 8GB RAM
         create_slave("windows-gcebot1", properties={'jobs': 8}, max_builds=1),
 
         # Ubuntu x86-64, 51GiB System memory Intel(R) Xeon(R) CPU @ 2.60GHz
         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),
 
         # Intel(R) Core(TM)2 CPU 6420  @ 2.13GHz, Ubuntu Oneiric x86_64
         #create_slave("arxan_davinci", properties={'jobs': 4}, max_builds=1),
 
         # Intel(R) Core(TM)2 CPU 6420  @ 2.13GHz, Ubuntu Oneiric x86_64

zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

def getLLDBxcodebuildFactory(use_cc=None):
     f = buildbot.process.factory.BuildFactory()
     f.addStep(SetProperty(name='get_builddir',
                           command=['pwd'],
                           property='builddir',
                           description='set build dir',
                           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)],
                            haltOnFailure=True,
                            workdir=WithProperties('%(builddir)s')))
     f.addStep(ShellCommand(name='clean.llvm-buid',
                            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/',
                   defaultBranch='trunk',
                   workdir=lldb_srcdir))
     f.addStep(SVN(name='svn-llvm',
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/llvm/',

 # Building the sources
 #
     f.addStep(ShellCommand(name='lldb-build',
                            command=['xcrun', 'xcodebuild', '-workspace',
                                     'lldb.xcworkspace', '-scheme', 'lldb-tool',
                                     '-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
 #
     if not use_cc:
         use_cc = '/Applications/Xcode.app/Contents/Developer/Toolchains/'
         use_cc += 'XcodeDefault.xctoolchain/usr/bin/clang'
         f.addStep(SetProperty(name='set.cc',
                   command=['xcrun', '-find', 'clang'],
                   property='use_cc',
                   description='set cc',
                   workdir=lldb_srcdir))
     else:
         f.addStep(SetProperty(name='set.cc',
                   command=['echo', use_cc],
                   property='use_cc',
                   description='set cc',
                   workdir=lldb_srcdir))
 
-    f.addStep(ShellCommand(name='lldb-test',
-                           command=['./dotest.py', '-v', '-C',
-                                    WithProperties('%(use_cc)s')],
+    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))
+                             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.:
 #
 # 2012-10-16-11_26_48/Failure-x86_64-_Applications_Xcode.app_Contents_Developer_Toolchains_XcodeDefault.xctoolchain_usr_bin_clang-TestLogging.LogTestCase.test_with_dsym.log
 #
 # Possible results are ExpectedFailure, Failure, SkippedTest, UnexpectedSuccess, and Error.    return f
     return f