Skip to content

Commit 67f673a

Browse files
committed
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'
2 parents 6b37389 + a5f52c6 commit 67f673a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

t/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ appropriately before running "make".
154154
As the names depend on the tests' file names, it is safe to
155155
run the tests with this option in parallel.
156156

157+
-V::
157158
--verbose-log::
158159
Write verbose output to the same logfile as `--tee`, but do
159160
_not_ write it to stdout. Unlike `--tee --verbose`, this option

t/test-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ case "$GIT_TEST_TEE_STARTED, $* " in
6767
done,*)
6868
# do not redirect again
6969
;;
70-
*' --tee '*|*' --va'*|*' --verbose-log '*)
70+
*' --tee '*|*' --va'*|*' -V '*|*' --verbose-log '*)
7171
mkdir -p "$TEST_OUTPUT_DIRECTORY/test-results"
7272
BASE="$TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" .sh)"
7373

@@ -316,7 +316,7 @@ do
316316
echo >&2 "warning: ignoring -x; '$0' is untraceable without BASH_XTRACEFD"
317317
fi
318318
shift ;;
319-
--verbose-log)
319+
-V|--verbose-log)
320320
verbose_log=t
321321
shift ;;
322322
*)

0 commit comments

Comments
 (0)