Merge branch 'jk/test-output'
commit31d176d08383012f9cbd040636151e22724b5ee7
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 May 2013 21:29:11 +0000 (29 14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 May 2013 21:29:11 +0000 (29 14:29 -0700)
treec6e07533809175d77c3a7db45f63db81674d1a02
parent7e2d574c37c6d53f09ceeb650f7af001aa50e987
parentb3e0c4ed07e9f76e501c67c3677776e4f257d274
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
Makefile
t/Makefile
t/test-lib.sh