diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:31:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 16:31:17 -0700 |
| commit | ad4d8911f8d680ea3948760ba025351ff031736d (patch) | |
| tree | e16a677e0de94afb000d2d56f2a80c0d219b47c7 /t/Makefile | |
| parent | Merge branch 'wt/doc-submodule-name-path-confusion-2' (diff) | |
| parent | t0001: drop subshells just for "cd" (diff) | |
| download | tgif-ad4d8911f8d680ea3948760ba025351ff031736d.tar.xz | |
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
Diffstat (limited to 't/Makefile')
| -rw-r--r-- | t/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/Makefile b/t/Makefile index 2373a04f7a..8fd1a72357 100644 --- a/t/Makefile +++ b/t/Makefile @@ -36,11 +36,11 @@ test: pre-clean $(TEST_LINT) $(MAKE) aggregate-results-and-cleanup prove: pre-clean $(TEST_LINT) - @echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS) + @echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS) $(MAKE) clean-except-prove-cache $(T): - @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS) + @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS) pre-clean: $(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)' |