t: do not pass GIT_TEST_OPTS to unit tests with prove

Git fork

When using the prove target, we append GIT_TEST_OPTS to the arguments
that we execute each of the tests with. This doesn't only include the
intended test scripts, but also ends up passing the arguments to our
unit tests. This is unintentional though as they do not even know to
interpret those arguments, and is inconsistent with how we execute unit
tests without prove.

This isn't much of an issue because our current set of unit tests mostly
ignore their arguments anyway. With the introduction of clar-based unit
tests this is about to become an issue though, as these do parse their
command line argument to alter behaviour.

Prepare for this by passing GIT_TEST_OPTS to "run-test.sh" via an
environment variable. Like this, we can conditionally forward it to our
test scripts, only.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Patrick Steinhardt and committed by

Junio C Hamano 2 years ago 71360809 bb9c16bd

+3 -2

2 changed files

expand all

unified split

Makefile

run-test.sh

+2 -1

t/Makefile

··· 68 68 test -z "$$failed" || $(MAKE) $$failed 69 69 70 70 prove: pre-clean check-chainlint $(TEST_LINT) 71 - @echo "*** prove (shell & unit tests) ***"; $(CHAINLINTSUPPRESS) TEST_SHELL_PATH='$(TEST_SHELL_PATH_SQ)' $(PROVE) --exec ./run-test.sh $(GIT_PROVE_OPTS) $(T) $(UNIT_TESTS) :: $(GIT_TEST_OPTS) 71 + @echo "*** prove (shell & unit tests) ***" 72 + @$(CHAINLINTSUPPRESS) TEST_OPTIONS='$(GIT_TEST_OPTS)' TEST_SHELL_PATH='$(TEST_SHELL_PATH_SQ)' $(PROVE) --exec ./run-test.sh $(GIT_PROVE_OPTS) $(T) $(UNIT_TESTS) 72 73 $(MAKE) clean-except-prove-cache 73 74 74 75 $(T):

+1 -1

t/run-test.sh

··· 10 10 echo >&2 "ERROR: TEST_SHELL_PATH is empty or not set" 11 11 exit 1 12 12 fi 13 - exec "${TEST_SHELL_PATH}" "$@" 13 + exec "${TEST_SHELL_PATH}" "$@" ${TEST_OPTIONS} 14 14 ;; 15 15 *) 16 16 exec "$@"