t: do not pass GIT_TEST_OPTS to unit tests with prove

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>

diff --git a/t/Makefile b/t/Makefile
index 4c30e7c..d2212de 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -68,7 +68,8 @@ failed:
        test -z "$$failed" || $(MAKE) $$failed
 
 prove: pre-clean check-chainlint $(TEST_LINT)
-       @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)
+       @echo "*** prove (shell & unit tests) ***"
+       @$(CHAINLINTSUPPRESS) TEST_OPTIONS='$(GIT_TEST_OPTS)' TEST_SHELL_PATH='$(TEST_SHELL_PATH_SQ)' $(PROVE) --exec ./run-test.sh $(GIT_PROVE_OPTS) $(T) $(UNIT_TESTS)
        $(MAKE) clean-except-prove-cache
 
 $(T):

diff --git a/t/run-test.sh b/t/run-test.sh
index 13c353b..63328ac 100755 (executable)
--- a/t/run-test.sh
+++ b/t/run-test.sh
@@ -10,7 +10,7 @@ case "$1" in
                echo >&2 "ERROR: TEST_SHELL_PATH is empty or not set"
                exit 1
        fi
-       exec "${TEST_SHELL_PATH}" "$@"
+       exec "${TEST_SHELL_PATH}" "$@" ${TEST_OPTIONS}
        ;;
 *)
        exec "$@"