commit 000e253dfe70274b952c7b6241d9eaa200720eda
author Galina Kistanova <gkistanova@gmail.com> Mon Oct 14 22:57:48 2019 +0000
committer Galina Kistanova <gkistanova@gmail.com> Mon Oct 14 22:57:48 2019 +0000
tree 1e7ece6a4e253343b8e93e004a0def1d272ac77e
parent 5049f32f045074bf4e5ec24dac4bb10657478371

Sanitize kwargs in UnifiedTreeBuilder.getCmakeWithNinjaMultistageBuildFactory.

git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@374839 91177308-0d34-0410-b5e6-96231b3b80d8

zorg/buildbot/builders/UnifiedTreeBuilder.py

diff --git a/zorg/buildbot/builders/UnifiedTreeBuilder.py b/zorg/buildbot/builders/UnifiedTreeBuilder.py
index 9cb3f3e..a1ed6fd 100644
--- a/zorg/buildbot/builders/UnifiedTreeBuilder.py
+++ b/zorg/buildbot/builders/UnifiedTreeBuilder.py
@@ -213,7 +213,7 @@
         # Overwrite pre-set items with the given ones, so user can set anything.
         merged_env.update(env)
 
-    f = getgetLLVMBuildFactoryAndSourcecodeSteps
+    f = getLLVMBuildFactoryAndSourcecodeSteps(
             depends_on_projects=depends_on_projects,
             llvm_srcdir=llvm_srcdir,
             obj_dir=obj_dir,
@@ -396,7 +396,7 @@
         stage_objdirs.append("%s/%s" % (obj_dir, s))
         stage_installdirs.append("%s/%s" % (install_dir, s))
 
-    f = getLLVMBuildFactoryAndSourcecodeSteps(
+    f = getLLVMBuildFactoryAndPrepareForSourcecodeSteps(
             depends_on_projects=depends_on_projects,
             llvm_srcdir=llvm_srcdir,
             obj_dir=obj_dir,
@@ -407,6 +407,11 @@
             stage_names=stage_names,
             **kwargs) # Pass through all the extra arguments.
 
+    # Get the source code.
+    # We have consumed kwargs specific to this factory, so
+    # it is safe to pass all the remaining kwargs down.
+    f.addGetSourcecodeSteps(**kwargs)
+
     # Set proper defaults.
     CmakeCommand.applyDefaultOptions(cmake_args, [
         ('-DCMAKE_BUILD_TYPE=',        'Release'),