aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests.py
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-02-26 22:07:04 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-02-26 22:48:30 +0100
commita7df3f9e2c20e8430d55d112b736f039ba93b9a2 (patch)
tree717692642d0faa7d100fd0ef171784a95f9aa152 /tools/run_tests/run_tests.py
parent10d20a3ec82b5d6b8abbc823196518b53dd6b9c4 (diff)
Improving travis output.
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-xtools/run_tests/run_tests.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 7c6a050a67..5942ae9180 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -175,6 +175,10 @@ argp.add_argument('-f', '--forever',
default=False,
action='store_const',
const=True)
+argp.add_argument('-t', '--travis',
+ default=False,
+ action='store_const',
+ const=True)
argp.add_argument('--newline_on_success',
default=False,
action='store_const',
@@ -251,17 +255,18 @@ class TestCache(object):
self.parse(json.loads(f.read()))
-def _build_and_run(check_cancelled, newline_on_success, cache):
+def _build_and_run(check_cancelled, newline_on_success, travis, cache):
"""Do one pass of building & running tests."""
# build latest sequentially
- if not jobset.run(build_steps, maxjobs=1):
+ if not jobset.run(build_steps, maxjobs=1,
+ newline_on_success=newline_on_success, travis=travis):
return 1
# run all the tests
all_runs = itertools.chain.from_iterable(
itertools.repeat(one_run, runs_per_test))
if not jobset.run(all_runs, check_cancelled,
- newline_on_success=newline_on_success,
+ newline_on_success=newline_on_success, travis=travis,
maxjobs=min(args.jobs, min(c.maxjobs for c in run_configs)),
cache=cache):
return 2
@@ -292,6 +297,7 @@ if forever:
else:
result = _build_and_run(check_cancelled=lambda: False,
newline_on_success=args.newline_on_success,
+ travis=args.travis,
cache=test_cache)
if result == 0:
jobset.message('SUCCESS', 'All tests passed', do_newline=True)