diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-08-16 09:28:47 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-08-16 09:28:50 -0400 |
| commit | aed15edf179d75f4835da499de8c97a76120bcb4 (patch) | |
| tree | a0c30c298d71024185cc1947d15890f43c301e37 | |
| parent | 21a165325eda90fa6eb70ca0b9e3fa23924f5964 (diff) | |
| parent | faba46da07cd8383d0bc841d37ea9cacba60e354 (diff) | |
Merge #16633: travis: Fix test_runner.py timeouts
faba46da07cd8383d0bc841d37ea9cacba60e354 ci: Set --ansi in test_runner (MarcoFalke)
Pull request description:
Fixup to:
* tests: Use colors and dots in test_runner.py output only if standard output is a terminal #16561
ACKs for top commit:
practicalswift:
ACK faba46da07cd8383d0bc841d37ea9cacba60e354 -- diff looks correct
fanquake:
ACK faba46da07cd8383d0bc841d37ea9cacba60e354 - assuming Travis is all green.
Tree-SHA512: 50bf6ec8e7a2987d77821816289fd87458e63237d419a149e5e04027387d2c4b3c23db58977585fda30fbc4b13686a7def0d9e00096b9a8469dea2916fd30565
| -rwxr-xr-x | ci/test/06_script_b.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index fafb6e0493..d179ce81c0 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -16,7 +16,7 @@ fi if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then BEGIN_FOLD functional-tests - DOCKER_EXEC test/functional/test_runner.py --ci --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast + DOCKER_EXEC test/functional/test_runner.py --ci --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast END_FOLD fi |