From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:01:20 +0000 (-0700)
Subject: Merge branch 'jk/tap-verbose-fix' into maint
X-Git-Tag: v2.10.2~8
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=b943a213fe6740f64e2ce3fafebce453814115d9;p=git.git

Merge branch 'jk/tap-verbose-fix' into maint

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
---

b943a213fe6740f64e2ce3fafebce453814115d9
diff --cc .travis.yml
index 37a1e1fb6d,35f0fcb183..9a65514d82
--- a/.travis.yml
+++ b/.travis.yml
@@@ -31,8 -29,7 +31,8 @@@ 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
      # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X