diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:52 +0300 |
| commit | 0e57d28a3a867cf2a1cef9e429150709b6f89b91 (patch) | |
| tree | c87310b8ae2dada8e0dd60d7a46cc8f805998d81 | |
| parent | a1601a582a727782351cbb6e0528af87ac22abaa (diff) | |
| parent | a5f52c6dab2337c8feae2a733e81a64e0605b113 (diff) | |
Merge branch 'sg/test-verbose-log' into maint
Our test scripts can now take the '-V' option as a synonym for the
'--verbose-log' option.
* sg/test-verbose-log:
test-lib: introduce the '-V' short option for '--verbose-log'
| -rw-r--r-- | t/README | 1 | ||||
| -rw-r--r-- | t/test-lib.sh | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -154,6 +154,7 @@ appropriately before running "make". As the names depend on the tests' file names, it is safe to run the tests with this option in parallel. +-V:: --verbose-log:: Write verbose output to the same logfile as `--tee`, but do _not_ write it to stdout. Unlike `--tee --verbose`, this option diff --git a/t/test-lib.sh b/t/test-lib.sh index 44288cbb59..1373fd4592 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -67,7 +67,7 @@ case "$GIT_TEST_TEE_STARTED, $* " in done,*) # do not redirect again ;; -*' --tee '*|*' --va'*|*' --verbose-log '*) +*' --tee '*|*' --va'*|*' -V '*|*' --verbose-log '*) mkdir -p "$TEST_OUTPUT_DIRECTORY/test-results" BASE="$TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" .sh)" @@ -285,7 +285,7 @@ do echo >&2 "warning: ignoring -x; '$0' is untraceable without BASH_XTRACEFD" fi shift ;; - --verbose-log) + -V|--verbose-log) verbose_log=t shift ;; *) |