From 5586d736fd2450eb0aa4891bc416cd5029cfb99d Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Tue, 5 Sep 2017 10:15:41 -0400 Subject: [PATCH] Fix doStepIf and hideStepIf on ComputeTryCount --- master.cfg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/master.cfg b/master.cfg index d3fd2ee..31a249b 100644 --- a/master.cfg +++ b/master.cfg @@ -785,7 +785,7 @@ command must not make BuildBot halt on failure.""" class ComputeTryBuildCount (steps.BuildStep): def run (self): - istry = props.getProperty ('scheduler').startswith ('try') + istry = self.getProperty ('scheduler').startswith ('try') if not istry: count = 0 @@ -803,6 +803,8 @@ def scheduler_is_racy (step): return step.getProperty ('scheduler').startswith ('racy') def scheduler_is_try (step): return step.getProperty ('scheduler').startswith ('try') +def scheduler_is_not_try_hide (result, step): + return not scheduler_is_try (step) def scheduler_is_racy_hide (result, step): return scheduler_is_racy (step) def scheduler_is_racy_try_hide (result, step): @@ -929,7 +931,8 @@ The parameters of the class are: self.addStep (CloneOrUpdateGDBRepo ()) # Set the count of the try build - self.addStep (ComputeTryBuildCount (hideStepIf = scheduler_is_not_try)) + self.addStep (ComputeTryBuildCount (doStepIf = scheduler_is_try, + hideStepIf = scheduler_is_not_try_hide)) if self.run_testsuite: self.addStep (CopyOldGDBSumFile (doStepIf = scheduler_is_not_racy_try_do,