[zorg] r374697 - UnifiedTreeBuilder code cleaning. NFC.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Sat Oct 12 20:30:02 2019
New Revision: 374697

URL: http://llvm.org/viewvc/llvm-project?rev=374697&view=rev
Log:
UnifiedTreeBuilder code cleaning. NFC.

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

Modified: zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py?rev=374697&r1=374696&r2=374697&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py Sat Oct 12 20:30:02 2019
@@ -20,25 +20,21 @@ def getLLVMBuildFactoryAndSVNSteps(
            **kwargs):
 
     def cleanBuildRequestedByProperty(step):
-      return step.build.getProperty("clean")
-
-    # Set defaults
-    if not depends_on_projects:
-        depends_on_projects=['llvm', 'clang']
+        return step.build.getProperty("clean")
 
     if cleanBuildRequested is None:
-       # We want a clean checkout only if requested by the property.
-       cleanBuildRequested = cleanBuildRequestedByProperty
+        # We want a clean checkout only if requested by the property.
+        cleanBuildRequested = cleanBuildRequestedByProperty
 
     f = LLVMBuildFactory(
             depends_on_projects=depends_on_projects,
-            llvm_srcdir=llvm_srcdir or "llvm",
-            obj_dir=obj_dir or "build",
+            llvm_srcdir=llvm_srcdir,
+            obj_dir=obj_dir,
             install_dir=install_dir,
             cleanBuildRequested=cleanBuildRequested,
             **kwargs) # Pass through all the extra arguments.
 
-    # Do a clean checkout if requested by a build property.
+    # Remove the source code for a clean checkout if requested by property.
     # TODO: Some Windows slaves do not handle RemoveDirectory command well.
     # So, consider running "rmdir /S /Q <dir>" if the build runs on Windows.
     f.addStep(RemoveDirectory(name='clean-src-dir',
@@ -118,7 +114,6 @@ def addCmakeSteps(
                            description=["Cmake", "configure", stage_name],
                            options=cmake_args,
                            path=src_dir,
-                           haltOnFailure=kwargs.get('haltOnFailure', True),
                            env=env,
                            workdir=obj_dir,
                            **kwargs # Pass through all the extra arguments.
@@ -147,7 +142,6 @@ def addNinjaSteps(
     f.addStep(NinjaCommand(name="build-%sunified-tree" % step_name,
                            targets=targets,
                            description=["Build", stage_name, "unified", "tree"],
-                           haltOnFailure=kwargs.get('haltOnFailure', True),
                            env=env,
                            workdir=obj_dir,
                            **kwargs # Pass through all the extra arguments.
@@ -158,7 +152,6 @@ def addNinjaSteps(
       f.addStep(NinjaCommand(name="test-%s%s" % (step_name,"-".join(checks)),
                              targets=checks,
                              description=["Test", "just", "built", "components"],
-                             haltOnFailure=kwargs.get('haltOnFailure', True),
                              env=env,
                              workdir=obj_dir,
                              **kwargs # Pass through all the extra arguments.
@@ -169,7 +162,6 @@ def addNinjaSteps(
         f.addStep(NinjaCommand(name="install-%sall" % step_name,
                                targets=["install"],
                                description=["Install", "just", "built", "components"],
-                               haltOnFailure=kwargs.get('haltOnFailure', True),
                                env=env,
                                workdir=obj_dir,
                                **kwargs # Pass through all the extra arguments.