From cc831a2d82a496fb89750864c9d4c4c8374de26b Mon Sep 17 00:00:00 2001 From: Buildbot system user Date: Fri, 12 Jan 2018 15:50:10 +0000 Subject: Don't re-run meson on incremental builds --- modulesetparser.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modulesetparser.py b/modulesetparser.py index dcf896a..0a7ebd0 100755 --- a/modulesetparser.py +++ b/modulesetparser.py @@ -400,7 +400,11 @@ def BuilderList(slaves): elif m.tag == 'meson': - factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env)) + if not incremental: + factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env)) + else: + factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env, doStepIf=force_configure, hideStepIf=lambda results, s: results==SKIPPED)) + factory.addStep(Compile(command=['ninja', '-C', 'build'], logEnviron=logEnviron, env=env)) factory.addStep(Compile(command=['ninja', '-C', 'build', 'test'], name='test', description='testing', descriptionDone='test', logEnviron=logEnviron, env=env, timeout=3600)) factory.addStep(Compile(command=['ninja', '-C', 'build', 'install'], name='install', description='installing', descriptionDone='install', logEnviron=logEnviron, env=env)) -- cgit v1.2.3