Merge branch 'ci-phasesconfig' into lc-eph
This commit is contained in:
commit
7e6a990790
|
@ -602,13 +602,13 @@ def with_config_overrides(config_overrides, emitted_fork=None, emit=True):
|
||||||
output_config = output
|
output_config = output
|
||||||
kw['phases'] = phases
|
kw['phases'] = phases
|
||||||
|
|
||||||
# Run the function
|
|
||||||
out = fn(*args, spec=spec, **kw)
|
|
||||||
|
|
||||||
# Emit requested spec (with overrides)
|
# Emit requested spec (with overrides)
|
||||||
if emit:
|
if emit:
|
||||||
yield 'config', 'cfg', output_config
|
yield 'config', 'cfg', output_config
|
||||||
|
|
||||||
|
# Run the function
|
||||||
|
out = fn(*args, spec=spec, **kw)
|
||||||
|
|
||||||
# If it's not returning None like a normal test function,
|
# If it's not returning None like a normal test function,
|
||||||
# it's generating things, and we need to complete it before setting back the config.
|
# it's generating things, and we need to complete it before setting back the config.
|
||||||
if out is not None:
|
if out is not None:
|
||||||
|
|
Loading…
Reference in New Issue