diff options
| author | Buildbot system user <buildbot@medusa> | 2018-01-12 15:50:10 +0000 |
|---|---|---|
| committer | Buildbot system user <buildbot@medusa> | 2018-01-12 16:06:28 +0000 |
| commit | cc831a2d82a496fb89750864c9d4c4c8374de26b (patch) | |
| tree | 1e61dea26b00ebb760d5d1316ec9fbbdfe76d7fb | |
| parent | 2917105d90e290fdb08f527ad30869763bfeaa41 (diff) | |
Don't re-run meson on incremental builds
| -rwxr-xr-x | modulesetparser.py | 6 |
1 files changed, 5 insertions, 1 deletions
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)) |