UnifiedTreeBuilder code cleaning. NFC.
git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@374697 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/zorg/buildbot/builders/UnifiedTreeBuilder.py b/zorg/buildbot/builders/UnifiedTreeBuilder.py
index 46c8907..070e1ae 100644
--- a/zorg/buildbot/builders/UnifiedTreeBuilder.py
+++ b/zorg/buildbot/builders/UnifiedTreeBuilder.py
@@ -20,25 +20,21 @@
**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 @@
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 @@
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 @@
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 @@
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.