X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/19134112bf942c0492f2095b668ea31c1a498f1a..837d464af77d76a2661d92e05167657cbf430d80:/tests/setup.sh

diff --git a/tests/setup.sh b/tests/setup.sh
index 9bb1f12..1457dd5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -31,6 +31,13 @@ mkrepo() {
 		git add file-$n
 		git commit -m "commit $n"
 	done
+	if test "$3" = "testplus"
+	then
+		echo "hello" >a+b
+		git add a+b
+		git commit -m "add a+b"
+		git branch "1+2"
+	fi
 	cd $dir
 }
 
@@ -40,11 +47,12 @@ setup_repos()
 	mkdir -p trash/cache
 	mkrepo trash/repos/foo 5 >/dev/null
 	mkrepo trash/repos/bar 50 >/dev/null
+	mkrepo trash/repos/foo+bar 10 testplus >/dev/null
 	cat >trash/cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/trash/cache
 
-nocache=0
+cache-size=1021
 snapshots=tar.gz tar.bz zip
 enable-log-filecount=1
 enable-log-linecount=1
@@ -61,14 +69,20 @@ repo.path=$PWD/trash/repos/foo/.git
 repo.url=bar
 repo.path=$PWD/trash/repos/bar/.git
 repo.desc=the bar repo
+
+repo.url=foo+bar
+repo.path=$PWD/trash/repos/foo+bar/.git
+repo.desc=the foo+bar repo
 EOF
 }
 
 prepare_tests()
 {
 	setup_repos
+	rm -f test-output.log 2>/dev/null
 	test_count=0
 	test_failed=0
+	echo "[$0]" "$@" >test-output.log
 	echo "$@" "($0)"
 }
 
@@ -77,7 +91,8 @@ tests_done()
 	printf "\n"
 	if test $test_failed -gt 0
 	then
-		printf "[%s of %s tests failed]\n" $test_failed $test_count
+		printf "test: *** %s failure(s), logfile=%s\n" \
+			$test_failed "$(pwd)/test-output.log"
 		false
 	fi
 }
@@ -87,14 +102,17 @@ run_test()
 	desc=$1
 	script=$2
 	((test_count++))
-	eval "$2" >test-output.log
+	printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
+	printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
+	eval "$2" >>test-output.log 2>>test-output.log
 	res=$?
+	printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
 	if test $res = 0
 	then
-		printf "  %s: ok - %s\n" $test_count "$desc"
+		printf " %2d) %-60s [ok]\n" $test_count "$desc"
 	else
 		((test_failed++))
-		printf "  %s: fail - %s\n" $test_count "$desc"
+		printf " %2d) %-60s [failed]\n" $test_count "$desc"
 	fi
 }
 
@@ -107,4 +125,3 @@ cgit_url()
 {
 	CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
-