From 3f8bd048af276a40805e36a179a76af2e60f8399 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 14 Jan 2015 12:48:54 -0800
Subject: [PATCH] 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.
---
tools/run_tests/run_tests.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 84193a1337..428f6c41b4 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -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))
--
GitLab