Merge branch 'stable'

[cgit.git] / tests / setup.sh

diff --git a/tests/setup.sh b/tests/setup.sh
index 66bf406d09f7129566f32067282cf4da219c8a0e..95acb542feb0644314427077bf137c3caeb5d8b9 100755 (executable)
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -25,12 +25,21 @@ mkrepo() {
        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,11 +49,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,6 +71,10 @@ 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
 }
 
@@ -89,7 +103,7 @@ run_test()
 {
        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
@@ -113,4 +127,3 @@ cgit_url()
 {
        CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
-