tree c6e07533809175d77c3a7db45f63db81674d1a02
parent 7e2d574c37c6d53f09ceeb650f7af001aa50e987
parent b3e0c4ed07e9f76e501c67c3677776e4f257d274
author Junio C Hamano <gitster@pobox.com> 1369862951 -0700
committer Junio C Hamano <gitster@pobox.com> 1369862951 -0700

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