Skip to content

Commit ad4d891

Browse files
committed
Merge branch 'jk/tests-cleanup'
* jk/tests-cleanup: t0001: drop subshells just for "cd" t0001: drop useless subshells t0001: use test_must_fail t0001: use test_config_global t0001: use test_path_is_* t0001: make symlink reinit test more careful t: prefer "git config --file" to GIT_CONFIG t: prefer "git config --file" to GIT_CONFIG with test_must_fail t: stop using GIT_CONFIG to cross repo boundaries t: drop useless sane_unset GIT_* calls t/test-lib: drop redundant unset of GIT_CONFIG t/Makefile: stop setting GIT_CONFIG
2 parents 00d4ff1 + 410c342 commit ad4d891

10 files changed

+87
-180
lines changed

t/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ test: pre-clean $(TEST_LINT)
3636
$(MAKE) aggregate-results-and-cleanup
3737

3838
prove: pre-clean $(TEST_LINT)
39-
@echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
39+
@echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
4040
$(MAKE) clean-except-prove-cache
4141

4242
$(T):
43-
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
43+
@echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
4444

4545
pre-clean:
4646
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'

0 commit comments

Comments
 (0)