X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/538cb4a7d73ee2e62f41f2a452dccf89ba5004d9..8729d251a900b2e6e22cc4c93a2193fd8a2b9acf:/tests/setup.sh

diff --git a/tests/setup.sh b/tests/setup.sh
index 66bf406..1e06107 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -20,17 +20,26 @@ mkrepo() {
 	name=$1
 	count=$2
 	dir=$PWD
-	test -d $name && return
+	test -d "$name" && return
 	printf "Creating testrepo %s\n" $name
-	mkdir -p $name
-	cd $name
+	mkdir -p "$name"
+	cd "$name"
 	git init
-	for ((n=1; n<=count; n++))
+	n=1
+	while test $n -le $count
 	do
 		echo $n >file-$n
 		git add file-$n
 		git commit -m "commit $n"
+		n=$(expr $n + 1)
 	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,17 +49,20 @@ 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
+	mkrepo "trash/repos/with space" 2 >/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
 summary-log=5
 summary-branches=5
 summary-tags=5
+clone-url=git://example.org/\$CGIT_REPO_URL.git
 
 repo.url=foo
 repo.path=$PWD/trash/repos/foo/.git
@@ -61,6 +73,14 @@ 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
+
+repo.url=with space
+repo.path=$PWD/trash/repos/with space/.git
+repo.desc=spaced repo
 EOF
 }
 
@@ -87,19 +107,31 @@ tests_done()
 
 run_test()
 {
+	bug=0
+	if test "$1" = "BUG"
+	then
+		bug=1
+		shift
+	fi
 	desc=$1
 	script=$2
-	((test_count++))
+	test_count=$(expr $test_count + 1)
 	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
+	if test $res = 0 -a $bug = 0
 	then
 		printf " %2d) %-60s [ok]\n" $test_count "$desc"
+	elif test $res = 0 -a $bug = 1
+	then
+		printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc"
+	elif test $bug = 1
+	then
+		printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc"
 	else
-		((test_failed++))
+		test_failed=$(expr $test_failed + 1)
 		printf " %2d) %-60s [failed]\n" $test_count "$desc"
 	fi
 }
@@ -113,4 +145,3 @@ cgit_url()
 {
 	CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
-