summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Sverre Rabbelier <srabbelier@gmail.com>2008-06-08 16:04:33 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-08 15:07:27 -0700
commit2d84e9fb6d281ed039bd67aafcdd8516a2b5226e (patch)
treed75c2276d77df6cabfcb8ec2b9bc0d9c3ea07b24
parentGIT 1.5.6-rc2 (diff)
downloadtgif-2d84e9fb6d281ed039bd67aafcdd8516a2b5226e.tar.xz
Modify test-lib.sh to output stats to t/test-results/*
This change is needed order to aggregate data on the test run later on. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/Makefile2
-rw-r--r--t/test-lib.sh15
2 files changed, 15 insertions, 2 deletions
diff --git a/t/Makefile b/t/Makefile
index c6a60ab165..dfa90ace1a 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -20,7 +20,7 @@ $(T):
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
clean:
- $(RM) -r 'trash directory'
+ $(RM) -r 'trash directory' test-results
# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
full-svn-test:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 7a8bd27abc..2ad3f4a126 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -152,6 +152,7 @@ test_failure=0
test_count=0
test_fixed=0
test_broken=0
+test_success=0
die () {
echo >&5 "FATAL: Unexpected exit with code $?"
@@ -193,6 +194,7 @@ test_tick () {
test_ok_ () {
test_count=$(expr "$test_count" + 1)
+ test_success=$(expr "$test_success" + 1)
say_color "" " ok $test_count: $@"
}
@@ -353,6 +355,16 @@ test_create_repo () {
test_done () {
trap - exit
+ test_results_dir="$TEST_DIRECTORY/test-results"
+ mkdir -p "$test_results_dir"
+ test_results_path="$test_results_dir/${0%-*}-$$"
+
+ echo "total $test_count" >> $test_results_path
+ echo "success $test_success" >> $test_results_path
+ echo "fixed $test_fixed" >> $test_results_path
+ echo "broken $test_broken" >> $test_results_path
+ echo "failed $test_failure" >> $test_results_path
+ echo "" >> $test_results_path
if test "$test_fixed" != 0
then
@@ -387,7 +399,8 @@ test_done () {
# Test the binaries we have just built. The tests are kept in
# t/ subdirectory and are run in trash subdirectory.
-PATH=$(pwd)/..:$PATH
+TEST_DIRECTORY=$(pwd)
+PATH=$TEST_DIRECTORY/..:$PATH
GIT_EXEC_PATH=$(pwd)/..
GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
unset GIT_CONFIG