[zorg] r242556 - [zorg]For darwin lldb builder, remove symbolic link at the beginning of build

[Ying Chen]

Author: chying
Date: Fri Jul 17 13:23:11 2015
New Revision: 242556

URL: http://llvm.org/viewvc/llvm-project?rev=242556&view=rev
Log:
[zorg]For darwin lldb builder, remove symbolic link at the beginning of build

Found that with the original order, if a build step failed or interrupted before removing symbolic link step, removing step won't be executed, and cause next build fail

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

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=242556&r1=242555&r2=242556&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri Jul 17 13:23:11 2015
@@ -747,6 +747,13 @@ def getLLDBxcodebuildFactory(use_cc=None
                            command='rm -rf %s/build/*' % lldb_srcdir,
                            haltOnFailure=True,
                            workdir=WithProperties('%(builddir)s')))
+    # Remove symbolic link to lldb, otherwise xcodebuild will have circular dependency
+    f.addStep(ShellCommand(name='remove symbolic link lldb',
+                           command=['rm',
+                                    lldb_srcdir + '/llvm/tools/lldb'],
+                           haltOnFailure=False,
+                           flunkOnFailure=False,
+                           workdir=WithProperties('%(builddir)s')))
     f.addStep(SVN(name='svn-lldb',
                   mode='update',
                   baseURL='http://llvm.org/svn/llvm-project/lldb/',
@@ -838,13 +845,6 @@ def getLLDBxcodebuildFactory(use_cc=None
                                        build_type,
                                        config,
                                        env={'DYLD_FRAMEWORK_PATH' : WithProperties('%(lldb_bindir)s')})
-        # Remove symbolic link to lldb, otherwise xcodebuild will have circular dependency in next build
-        f.addStep(ShellCommand(name='remove symbolic link lldb',
-                               command=['rm',
-                                        lldb_srcdir + '/llvm/tools/lldb'],
-                               haltOnFailure=False,
-                               flunkOnFailure=False,
-                               workdir=WithProperties('%(builddir)s')))
 # Compress and upload test log
     f = archiveLLDBTestTraces(f, "build/lldb-test-traces*")