1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 04:26:10 +02:00

Merge branch 'sg/test-verbose-log'

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'
This commit is contained in:
Junio C Hamano 2018-11-06 15:50:23 +09:00
commit 67f673aa4a
2 changed files with 3 additions and 2 deletions

View File

@ -154,6 +154,7 @@ appropriately before running "make".
As the names depend on the tests' file names, it is safe to As the names depend on the tests' file names, it is safe to
run the tests with this option in parallel. run the tests with this option in parallel.
-V::
--verbose-log:: --verbose-log::
Write verbose output to the same logfile as `--tee`, but do Write verbose output to the same logfile as `--tee`, but do
_not_ write it to stdout. Unlike `--tee --verbose`, this option _not_ write it to stdout. Unlike `--tee --verbose`, this option

View File

@ -67,7 +67,7 @@ case "$GIT_TEST_TEE_STARTED, $* " in
done,*) done,*)
# do not redirect again # do not redirect again
;; ;;
*' --tee '*|*' --va'*|*' --verbose-log '*) *' --tee '*|*' --va'*|*' -V '*|*' --verbose-log '*)
mkdir -p "$TEST_OUTPUT_DIRECTORY/test-results" mkdir -p "$TEST_OUTPUT_DIRECTORY/test-results"
BASE="$TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" .sh)" BASE="$TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" .sh)"
@ -316,7 +316,7 @@ do
echo >&2 "warning: ignoring -x; '$0' is untraceable without BASH_XTRACEFD" echo >&2 "warning: ignoring -x; '$0' is untraceable without BASH_XTRACEFD"
fi fi
shift ;; shift ;;
--verbose-log) -V|--verbose-log)
verbose_log=t verbose_log=t
shift ;; shift ;;
*) *)