summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index 95acb54..30f90d5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -20,110 +20,110 @@ mkrepo() {
20 name=$1 20 name=$1
21 count=$2 21 count=$2
22 dir=$PWD 22 dir=$PWD
23 test -d $name && return 23 test -d $name && return
24 printf "Creating testrepo %s\n" $name 24 printf "Creating testrepo %s\n" $name
25 mkdir -p $name 25 mkdir -p $name
26 cd $name 26 cd $name
27 git init 27 git init
28 n=1 28 n=1
29 while test $n -le $count 29 while test $n -le $count
30 do 30 do
31 echo $n >file-$n 31 echo $n >file-$n
32 git add file-$n 32 git add file-$n
33 git commit -m "commit $n" 33 git commit -m "commit $n"
34 n=$(expr $n + 1) 34 n=$(expr $n + 1)
35 done 35 done
36 if test "$3" = "testplus" 36 if test "$3" = "testplus"
37 then 37 then
38 echo "hello" >a+b 38 echo "hello" >a+b
39 git add a+b 39 git add a+b
40 git commit -m "add a+b" 40 git commit -m "add a+b"
41 git branch "1+2" 41 git branch "1+2"
42 fi 42 fi
43 cd $dir 43 cd $dir
44} 44}
45 45
46setup_repos() 46setup_repos()
47{ 47{
48 rm -rf trash/cache 48 rm -rf trash/cache
49 mkdir -p trash/cache 49 mkdir -p trash/cache
50 mkrepo trash/repos/foo 5 >/dev/null 50 mkrepo trash/repos/foo 5 >/dev/null
51 mkrepo trash/repos/bar 50 >/dev/null 51 mkrepo trash/repos/bar 50 >/dev/null
52 mkrepo trash/repos/foo+bar 10 testplus >/dev/null 52 mkrepo trash/repos/foo+bar 10 testplus >/dev/null
53 cat >trash/cgitrc <<EOF 53 cat >trash/cgitrc <<EOF
54virtual-root=/ 54virtual-root=/
55cache-root=$PWD/trash/cache 55cache-root=$PWD/trash/cache
56 56
57cache-size=1021 57cache-size=1021
58snapshots=tar.gz tar.bz zip 58snapshots=tar.gz tar.bz zip
59enable-log-filecount=1 59enable-log-filecount=1
60enable-log-linecount=1 60enable-log-linecount=1
61summary-log=5 61summary-log=5
62summary-branches=5 62summary-branches=5
63summary-tags=5 63summary-tags=5
64 64
65repo.url=foo 65repo.url=foo
66repo.path=$PWD/trash/repos/foo/.git 66repo.path=$PWD/trash/repos/foo/.git
67# Do not specify a description for this repo, as it then will be assigned 67# Do not specify a description for this repo, as it then will be assigned
68# the constant value "[no description]" (which actually used to cause a 68# the constant value "[no description]" (which actually used to cause a
69# segfault). 69# segfault).
70 70
71repo.url=bar 71repo.url=bar
72repo.path=$PWD/trash/repos/bar/.git 72repo.path=$PWD/trash/repos/bar/.git
73repo.desc=the bar repo 73repo.desc=the bar repo
74 74
75repo.url=foo+bar 75repo.url=foo+bar
76repo.path=$PWD/trash/repos/foo+bar/.git 76repo.path=$PWD/trash/repos/foo+bar/.git
77repo.desc=the foo+bar repo 77repo.desc=the foo+bar repo
78EOF 78EOF
79} 79}
80 80
81prepare_tests() 81prepare_tests()
82{ 82{
83 setup_repos 83 setup_repos
84 rm -f test-output.log 2>/dev/null 84 rm -f test-output.log 2>/dev/null
85 test_count=0 85 test_count=0
86 test_failed=0 86 test_failed=0
87 echo "[$0]" "$@" >test-output.log 87 echo "[$0]" "$@" >test-output.log
88 echo "$@" "($0)" 88 echo "$@" "($0)"
89} 89}
90 90
91tests_done() 91tests_done()
92{ 92{
93 printf "\n" 93 printf "\n"
94 if test $test_failed -gt 0 94 if test $test_failed -gt 0
95 then 95 then
96 printf "test: *** %s failure(s), logfile=%s\n" \ 96 printf "test: *** %s failure(s), logfile=%s\n" \
97 $test_failed "$(pwd)/test-output.log" 97 $test_failed "$(pwd)/test-output.log"
98 false 98 false
99 fi 99 fi
100} 100}
101 101
102run_test() 102run_test()
103{ 103{
104 desc=$1 104 desc=$1
105 script=$2 105 script=$2
106 test_count=$(expr $test_count + 1) 106 test_count=$(expr $test_count + 1)
107 printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log 107 printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
108 printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log 108 printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
109 eval "$2" >>test-output.log 2>>test-output.log 109 eval "$2" >>test-output.log 2>>test-output.log
110 res=$? 110 res=$?
111 printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log 111 printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
112 if test $res = 0 112 if test $res = 0
113 then 113 then
114 printf " %2d) %-60s [ok]\n" $test_count "$desc" 114 printf " %2d) %-60s [ok]\n" $test_count "$desc"
115 else 115 else
116 ((test_failed++)) 116 test_failed=$(expr $test_failed + 1)
117 printf " %2d) %-60s [failed]\n" $test_count "$desc" 117 printf " %2d) %-60s [failed]\n" $test_count "$desc"
118 fi 118 fi
119} 119}
120 120
121cgit_query() 121cgit_query()
122{ 122{
123 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" 123 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
124} 124}
125 125
126cgit_url() 126cgit_url()
127{ 127{
128 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" 128 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
129} 129}