зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
268fac6919
Коммит
3da9365234
|
@ -39,6 +39,6 @@ full-svn-test:
|
||||||
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
|
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
|
||||||
|
|
||||||
valgrind:
|
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
|
||||||
|
|
4
t/README
4
t/README
|
@ -65,6 +65,10 @@ appropriately before running "make".
|
||||||
the test script when running under -i). Valgrind errors
|
the test script when running under -i). Valgrind errors
|
||||||
go to stderr, so you might want to pass the -v option, too.
|
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::
|
--tee::
|
||||||
In addition to printing the test output to the terminal,
|
In addition to printing the test output to the terminal,
|
||||||
write it to files named 't/test-results/$TEST_NAME.out'.
|
write it to files named 't/test-results/$TEST_NAME.out'.
|
||||||
|
|
|
@ -9,7 +9,7 @@ case "$GIT_TEST_TEE_STARTED, $* " in
|
||||||
done,*)
|
done,*)
|
||||||
# do not redirect again
|
# do not redirect again
|
||||||
;;
|
;;
|
||||||
*' --tee '*)
|
*' --tee '*|*' --va'*)
|
||||||
mkdir -p test-results
|
mkdir -p test-results
|
||||||
BASE=test-results/$(basename "$0" .sh)
|
BASE=test-results/$(basename "$0" .sh)
|
||||||
(GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
|
(GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
|
||||||
|
@ -111,7 +111,7 @@ do
|
||||||
# noop now...
|
# noop now...
|
||||||
shift ;;
|
shift ;;
|
||||||
--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
|
--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
|
||||||
valgrind=t; shift ;;
|
valgrind=t; verbose=t; shift ;;
|
||||||
--tee)
|
--tee)
|
||||||
shift ;; # was handled already
|
shift ;; # was handled already
|
||||||
*)
|
*)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче