diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 21:29:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 21:29:11 (GMT) |
| commit | 31d176d08383012f9cbd040636151e22724b5ee7 (patch) | |
| tree | c6e07533809175d77c3a7db45f63db81674d1a02 /Makefile | |
| parent | 7e2d574c37c6d53f09ceeb650f7af001aa50e987 (diff) | |
| parent | b3e0c4ed07e9f76e501c67c3677776e4f257d274 (diff) | |
| download | git-31d176d08383012f9cbd040636151e22724b5ee7.zip git-31d176d08383012f9cbd040636151e22724b5ee7.tar.gz git-31d176d08383012f9cbd040636151e22724b5ee7.tar.bz2 | |
Merge branch 'jk/test-output'
When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
inconsistently between the test framework and t/Makefile, and logic
to summarize the results looked at a wrong place.
* jk/test-output:
t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
test output: respect $TEST_OUTPUT_DIRECTORY
t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2159,6 +2159,9 @@ GIT-BUILD-OPTIONS: FORCE @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@ @echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@ +ifdef TEST_OUTPUT_DIRECTORY + @echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@ +endif ifdef GIT_TEST_OPTS @echo GIT_TEST_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_OPTS)))'\' >>$@ endif |