phase1: hide/skip ccache steps if not available

[buildbot.git] / phase1 / master.cfg

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 52b2b8d455ad00351b77d2bb43ac0e34c87f9666..4c8156a6ec9b998e9d30c44455656a9907f42adb 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -595,12 +595,14 @@ for target in targets:
 
        # see if ccache is available
        factory.addStep(SetPropertyFromCommand(
+               name = "ccache",
                property = "ccache_command",
                command = ["which", "ccache"],
                description = "Testing for ccache command",
                haltOnFailure = False,
                flunkOnFailure = False,
                warnOnFailure = False,
+               hideStepIf = lambda r, s: r==results.FAILURE,
        ))
 
        # Workaround bug when switching from a checked out tag back to a branch
@@ -1129,7 +1131,7 @@ for target in targets:
                haltOnFailure = False,
                flunkOnFailure = False,
                warnOnFailure = False,
-               alwaysRun = True,
+               hideStepIf = lambda r, s: r==results.FAILURE,
        ))
 
        c['builders'].append(BuilderConfig(name=target, workernames=workerNames, factory=factory, nextBuild=GetNextBuild))