summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-06 15:50:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-06 15:50:23 +0900
commit67f673aa4a580b9e407b1ca505abf1f50510ec47 (patch)
treeb1865d58f54ce8fb88525f038bb56d46b8d66bc8
parentMerge branch 'rj/header-cleanup' (diff)
parenttest-lib: introduce the '-V' short option for '--verbose-log' (diff)
downloadtgif-67f673aa4a580b9e407b1ca505abf1f50510ec47.tar.xz
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'
-rw-r--r--t/README1
-rw-r--r--t/test-lib.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/t/README b/t/README
index 8847489640..2e9bef2852 100644
--- a/t/README
+++ b/t/README
@@ -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 897e6fcc94..47a99aa0ed 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)"
@@ -316,7 +316,7 @@ do
echo >&2 "warning: ignoring -x; '$0' is untraceable without BASH_XTRACEFD"
fi
shift ;;
- --verbose-log)
+ -V|--verbose-log)
verbose_log=t
shift ;;
*)