Using skip markers in nfc setup

If the NFC check setup fails to execute for any reason, we still want to run
tests unconditionally. To implement this, we now use skip markers: tests run
when these markers are not present.

If the current and previous llvm-bolt binaries are identical, we create two
skip markers for in-tree and out-of-tree tests. If there are other BOLT source
changes, we delete the in-tree skip marker so those test Can proceed.

Author: paschalis-mpeis

zorg/buildbot/builders/BOLTBuilder.py

@@ -4,7 +4,7 @@
 from zorg.buildbot.builders.UnifiedTreeBuilder import getLLVMBuildFactoryAndSourcecodeSteps, addCmakeSteps, addNinjaSteps
 from zorg.buildbot.commands.LitTestCommand import LitTestCommand
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
-from zorg.buildbot.conditions.FileConditions import FileExists
+from zorg.buildbot.conditions.FileConditions import FileDoesNotExist
 from zorg.buildbot.process.factory import LLVMBuildFactory
 
 def getBOLTCmakeBuildFactory(
@@ -92,10 +92,10 @@ def getBOLTCmakeBuildFactory(
     if is_nfc:
         # Marker for relevant source code changes, e.g., when updating tests.
         # Generated by nfc-check-setup.py and used to trigger the in-tree tests.
-        markerDiffCode = ".llvm-bolt.changes"
-        # Individual markers for running either in-tree or out-of-tree tests.
-        markerInTree = ".llvm-bolt.run.in-tree"
-        markerOutOfTree = ".llvm-bolt.run.out-of-tree"
+        hasSrcChanges = ".llvm-bolt.changes"
+        # Individual markers to skip either in-tree or out-of-tree tests.
+        skipInTree = ".llvm-bolt.skip.in-tree"
+        skipOutOfTree = ".llvm-bolt.skip.out-of-tree"
 
         f.addSteps([
             ShellCommand(
@@ -106,6 +106,7 @@ def getBOLTCmakeBuildFactory(
                         "--check-bolt-sources"
                         ],
                 description=('Setup NFC testing'),
+                descriptionDone=["NFC-Mode setup"],
                 warnOnFailure=True,
                 haltOnFailure=False,
                 flunkOnFailure=False,
@@ -133,11 +134,11 @@ def getBOLTCmakeBuildFactory(
             ShellCommand(
                 name='nfc-check-bolt-different',
                 command=(
-                          f'rm -f {markerInTree} {markerOutOfTree}; '
-                          f'[ -f {markerDiffCode} ] && touch {markerInTree};'
-                          f'rm -f {markerDiffCode}; '
-                          f'cmp -s bin/llvm-bolt.old bin/llvm-bolt.new || ('
-                          f'touch {markerInTree}; touch {markerOutOfTree}) '
+                          f'rm -f {skipInTree} {skipOutOfTree}; '
+                          f'cmp -s bin/llvm-bolt.old bin/llvm-bolt.new && ('
+                          f'touch {skipInTree}; touch {skipOutOfTree}); '
+                          f'[ -f {hasSrcChanges} ] && rm -f {skipInTree};'
+                          f'rm -f {hasSrcChanges}; '
                          ),
                 description=('Check if llvm-bolt binaries are different and '
                              'skip the following nfc-check steps'),
@@ -151,7 +152,7 @@ def getBOLTCmakeBuildFactory(
                 warnOnFailure=True,
                 haltOnFailure=False,
                 flunkOnFailure=True,
-                doStepIf=FileExists(f"build/{markerInTree}"),
+                doStepIf=FileDoesNotExist(f"build/{skipInTree}"),
                 env=env),
             LitTestCommand(
                 name='nfc-check-large-bolt',
@@ -162,7 +163,7 @@ def getBOLTCmakeBuildFactory(
                 warnOnFailure=True,
                 haltOnFailure=False,
                 flunkOnFailure=True,
-                doStepIf=FileExists(f"build/{markerOutOfTree}"),
+                doStepIf=FileDoesNotExist(f"build/{skipOutOfTree}"),
                 env=env),
             ])