Skip to content
Snippets Groups Projects
Commit 3f8bd048 authored by Craig Tiller's avatar Craig Tiller
Browse files

Fix return behavior of run_tools.py

If not running in forever mode, and a test fails, fail run_tests.py
also.

If running in forever mode and make fails, wait for the next run.
parent 87350d5d
No related branches found
No related tags found
No related merge requests found
......@@ -78,17 +78,20 @@ def _build_and_run(check_cancelled):
'CONFIG=%s' % cfg] + _MAKE_TEST_TARGETS
for cfg in build_configs),
check_cancelled, maxjobs=1):
sys.exit(1)
return 1
# run all the tests
jobset.run((
if not jobset.run((
config.run_command(x)
for config in run_configs
for filt in filters
for x in itertools.chain.from_iterable(itertools.repeat(
glob.glob('bins/%s/%s_test' % (
config.build_config, filt)),
runs_per_test))), check_cancelled)
runs_per_test))), check_cancelled):
return 2
return 0
if forever:
......@@ -100,5 +103,5 @@ if forever:
while not have_files_changed():
time.sleep(1)
else:
_build_and_run(lambda: False)
sys.exit(_build_and_run(lambda: False))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment