From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2008 20:19:22 +0000 (-0700)
Subject: Merge branch 'sr/tests'
X-Git-Tag: v1.6.0-rc0~210
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e4403d8bd3ccb6bcc3b6569012944d932334f5c4;p=git.git

Merge branch 'sr/tests'

* sr/tests:
  Hook up the result aggregation in the test makefile.
  A simple script to parse the results from the testcases
  Modify test-lib.sh to output stats to t/test-results/*

Conflicts:

	t/test-lib.sh
---

e4403d8bd3ccb6bcc3b6569012944d932334f5c4
diff --cc t/test-lib.sh
index f4f35ed43,2ad3f4a12..401011001
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -446,8 -398,9 +458,9 @@@ test_done () 
  }
  
  # Test the binaries we have just built.  The tests are kept in
 -# t/ subdirectory and are run in trash subdirectory.
 +# t/ subdirectory and are run in 'trash directory' subdirectory.
- PATH=$(pwd)/..:$PATH
+ TEST_DIRECTORY=$(pwd)
+ PATH=$TEST_DIRECTORY/..:$PATH
  GIT_EXEC_PATH=$(pwd)/..
  GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
  unset GIT_CONFIG