[zorg] r374839 - Sanitize kwargs in UnifiedTreeBuilder.getCmakeWithNinjaMultistageBuildFactory.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Mon Oct 14 15:57:48 2019
New Revision: 374839

URL: http://llvm.org/viewvc/llvm-project?rev=374839&view=rev
Log:
Sanitize kwargs in UnifiedTreeBuilder.getCmakeWithNinjaMultistageBuildFactory.

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=374839&r1=374838&r2=374839&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py Mon Oct 14 15:57:48 2019
@@ -213,7 +213,7 @@ def getCmakeBuildFactory(
         # 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 @@ def getCmakeWithNinjaMultistageBuildFact
         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 @@ def getCmakeWithNinjaMultistageBuildFact
             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'),