diff options
| -rw-r--r-- | t/Makefile | 2 | ||||
| -rw-r--r-- | t/README | 4 | ||||
| -rw-r--r-- | t/test-lib.sh | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/t/Makefile b/t/Makefile index e544493d10..09623414a7 100644 --- a/t/Makefile +++ b/t/Makefile @@ -39,6 +39,6 @@ full-svn-test: $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8 valgrind: - GIT_TEST_OPTS='--valgrind -v --tee' $(MAKE) -k + GIT_TEST_OPTS=--valgrind $(MAKE) .PHONY: pre-clean $(T) aggregate-results clean valgrind @@ -65,6 +65,10 @@ appropriately before running "make". the test script when running under -i). Valgrind errors go to stderr, so you might want to pass the -v option, too. + Since it makes no sense to run the tests with --valgrind and + not see any output, this option implies --verbose. For + convenience, it also implies --tee. + --tee:: In addition to printing the test output to the terminal, write it to files named 't/test-results/$TEST_NAME.out'. diff --git a/t/test-lib.sh b/t/test-lib.sh index 34f372c92f..bc87936bab 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -9,7 +9,7 @@ case "$GIT_TEST_TEE_STARTED, $* " in done,*) # do not redirect again ;; -*' --tee '*) +*' --tee '*|*' --va'*) mkdir -p test-results BASE=test-results/$(basename "$0" .sh) (GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1; @@ -111,7 +111,7 @@ do # noop now... shift ;; --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind) - valgrind=t; shift ;; + valgrind=t; verbose=t; shift ;; --tee) shift ;; # was handled already *) |