Tests: let --valgrind imply --verbose and --tee

It does not make much sense to run the (expensive) valgrind tests and
not look at the output.

To prevent output from scrolling out of reach, the parameter --tee is
implied, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/Makefile b/t/Makefile
index e544493d1053c6e7c01d492b748b8b762c2327d3..09623414a755dc7e964a0d21768e136dba4556e2 100644 (file)
--- 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:
        $(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
 
 .PHONY: pre-clean $(T) aggregate-results clean valgrind

diff --git a/t/README b/t/README
index ed1ebb6a5c058ee46c3f898ef0b1ba28d69df6f3..d8f6c7de6d27e27a33982e82893baa3bb5ffd7fd 100644 (file)
--- a/t/README
+++ b/t/README
@@ -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.
 
        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'.
 --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 34f372c92ffa659c4cc2f155bd40dd2ebd7be6af..bc87936babfd5fd7951904f18ad0e734fd3186b4 100644 (file)
--- 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
        ;;
 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;
        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)
                # noop now...
                shift ;;
        --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)

-               valgrind=t; shift ;;
+               valgrind=t; verbose=t; shift ;;

        --tee)
                shift ;; # was handled already
        *)
        --tee)
                shift ;; # was handled already
        *)