Merge branch 'stable'

[cgit.git] / tests / setup.sh

diff --git a/tests/setup.sh b/tests/setup.sh
index 9bb1f12f08d1cf6223e04635c05f256ba2c3e6a6..e3c6c17a307ee49863147f4bc96ae1170c42388c 100755 (executable)
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -15,23 +15,33 @@
 # run_test 'repo index' 'cgit_url "/" | tidy -e'
 # run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
 
+unset CDPATH
 
 mkrepo() {
        name=$1
        count=$2
        dir=$PWD
-       test -d $name && return
-       printf "Creating testrepo %s\n" $name
-       mkdir -p $name
-       cd $name
+       test -d "$name" && return
+       printf "Creating testrepo %s\n" "$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
-       cd $dir
+       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"
 }
 
 setup_repos()
@@ -40,17 +50,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,14 +74,24 @@ 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
 }
 
 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,24 +100,40 @@ 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
 }
 
 run_test()
 {
+       bug=0
+       if test "$1" = "BUG"
+       then
+               bug=1
+               shift
+       fi
        desc=$1
        script=$2
-       ((test_count++))
-       eval "$2" >test-output.log
+       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=$?
-       if test $res = 0
+       printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
+       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 "  %s: ok - %s\n" $test_count "$desc"
+               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++))
-               printf "  %s: fail - %s\n" $test_count "$desc"
+               test_failed=$(expr $test_failed + 1)
+               printf " %2d) %-60s [failed]\n" $test_count "$desc"
        fi
 }
 
@@ -107,4 +146,3 @@ cgit_url()
 {
        CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
-