From: Jeff King <peff@peff.net>
Date: Fri, 21 Oct 2016 10:48:12 +0000 (-0400)
Subject: travis: use --verbose-log test option
X-Git-Tag: v2.10.2~8^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/041c72de109075d630f77bc2ad225f6339f33c9a?hp=--cc

travis: use --verbose-log test option

Because we run the tests via "prove", the output from
"--verbose" may interfere with our TAP output. Using
"--verbose-log" solves this while letting us retain our
on-disk log.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

041c72de109075d630f77bc2ad225f6339f33c9a
diff --git a/.travis.yml b/.travis.yml
index adab5b89bb..35f0fcb183 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,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_CLONE_2GB=YesPlease
     # t9810 occasionally fails on Travis CI OS X
     # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X