summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-26 20:14:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-26 20:14:54 (GMT)
commitf4db874d9adc3d974a085b1238aad0048e7f2674 (patch)
tree59fc5f6bb177ae3584510c4bd3bd3df604f8a9f5 /.travis.yml
parentbdcaebbedd54eeaf430ad1e4093a07922fe656d9 (diff)
parent614fe015212d057c0571885c42a29a995973107d (diff)
downloadgit-f4db874d9adc3d974a085b1238aad0048e7f2674.zip
git-f4db874d9adc3d974a085b1238aad0048e7f2674.tar.gz
git-f4db874d9adc3d974a085b1238aad0048e7f2674.tar.bz2
Merge branch 'jk/tap-verbose-fix'
The Travis CI configuration we ship ran the tests with --verbose option but this risks non-TAP output that happens to be "ok" to be misinterpreted as TAP signalling a test that passed. This resulted in unnecessary failure. This has been corrected by introducing a new mode to run our tests in the test harness to send the verbose output separately to the log file. * jk/tap-verbose-fix: test-lib: bail out when "-v" used under "prove" travis: use --verbose-log test option test-lib: add --verbose-log option test-lib: handle TEST_OUTPUT_DIRECTORY with spaces
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 37a1e1f..9a65514 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ env:
- LINUX_GIT_LFS_VERSION="1.2.0"
- DEFAULT_TEST_TARGET=prove
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- - GIT_TEST_OPTS="--verbose --tee"
+ - GIT_TEST_OPTS="--verbose-log"
- GIT_TEST_HTTPD=true
- GIT_TEST_CLONE_2GB=YesPlease
# t9810 occasionally fails on Travis CI OS X