Check out the test-suite first to prevent poisoning got_revision property.

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

1 files changed, 22 insertions, 10 deletions

diff --git a/zorg/buildbot/builders/ABITestsuitBuilder.py b/zorg/buildbot/builders/ABITestsuitBuilder.py
index de26a04f..f566dc22 100644
--- a/zorg/buildbot/builders/ABITestsuitBuilder.py
+++ b/zorg/buildbot/builders/ABITestsuitBuilder.py
@@ -36,12 +36,13 @@ def getABITestsuitBuildFactory(
         ('-G',                      'Ninja'),
         ])
 
-    f = UnifiedTreeBuilder.getCmakeBuildFactory(
+    cleanBuildRequested = lambda step: step.build.getProperty("clean", default=step.build.getProperty("clean_obj")) or clean
+
+    f = UnifiedTreeBuilder.getLLVMBuildFactoryAndPrepareForSourcecodeSteps(
             depends_on_projects=depends_on_projects,
             llvm_srcdir="llvm",
             obj_dir="build",
-            clean=clean,
-            extra_configure_args=cmake_args,
+            cleanBuildRequested=cleanBuildRequested,
             env=merged_env,
             **kwargs) # Pass through all the extra arguments.
 
@@ -49,6 +50,24 @@ def getABITestsuitBuildFactory(
     # TODO: Remove this once legacy mode gets dropped.
     kwargs.pop('is_legacy_mode', None)
 
+    # First of all, we shall checkout the latest test-suite.
+    f.addGetSourcecodeForProject(
+        project='test-suite',
+        src_dir='test-suite',
+        alwaysUseLatest=True,
+        **kwargs)
+
+    # Then get the LLVM source code revision this particular build is for.
+    f.addGetSourcecodeSteps(**kwargs)
+
+    UnifiedTreeBuilder.addCmakeSteps(
+        f,
+        cleanBuildRequested=cleanBuildRequested,
+        obj_dir=f.obj_dir,
+        extra_configure_args=extra_configure_args,
+        env=env,
+        **kwargs)
+
     f.addStep(NinjaCommand(name="build-unified-tree",
                            haltOnFailure=True,
                            description=["Build", "unified", "tree"],
@@ -57,13 +76,6 @@ def getABITestsuitBuildFactory(
                            **kwargs # Pass through all the extra arguments.
                            ))
 
-    # Checkout the test-suite.
-    f.addGetSourcecodeForProject(
-        project='test-suite',
-        src_dir='test-suite',
-        alwaysUseLatest=True,
-        **kwargs)
-
     # Run the ABI test.
     abi_test_env = {
         'PYTHONPATH' : WithProperties("%(workdir)s/" + f.llvm_srcdir + "/utils/lit:${PYTHONPATH}"),