summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index 9bb1f12..5f20286 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -30,81 +30,81 @@ mkrepo() {
30 echo $n >file-$n 30 echo $n >file-$n
31 git add file-$n 31 git add file-$n
32 git commit -m "commit $n" 32 git commit -m "commit $n"
33 done 33 done
34 cd $dir 34 cd $dir
35} 35}
36 36
37setup_repos() 37setup_repos()
38{ 38{
39 rm -rf trash/cache 39 rm -rf trash/cache
40 mkdir -p trash/cache 40 mkdir -p trash/cache
41 mkrepo trash/repos/foo 5 >/dev/null 41 mkrepo trash/repos/foo 5 >/dev/null
42 mkrepo trash/repos/bar 50 >/dev/null 42 mkrepo trash/repos/bar 50 >/dev/null
43 cat >trash/cgitrc <<EOF 43 cat >trash/cgitrc <<EOF
44virtual-root=/ 44virtual-root=/
45cache-root=$PWD/trash/cache 45cache-root=$PWD/trash/cache
46 46
47nocache=0 47nocache=0
48snapshots=tar.gz tar.bz zip 48snapshots=tar.gz tar.bz zip
49enable-log-filecount=1 49enable-log-filecount=1
50enable-log-linecount=1 50enable-log-linecount=1
51summary-log=5 51summary-log=5
52summary-branches=5 52summary-branches=5
53summary-tags=5 53summary-tags=5
54 54
55repo.url=foo 55repo.url=foo
56repo.path=$PWD/trash/repos/foo/.git 56repo.path=$PWD/trash/repos/foo/.git
57# Do not specify a description for this repo, as it then will be assigned 57# Do not specify a description for this repo, as it then will be assigned
58# the constant value "[no description]" (which actually used to cause a 58# the constant value "[no description]" (which actually used to cause a
59# segfault). 59# segfault).
60 60
61repo.url=bar 61repo.url=bar
62repo.path=$PWD/trash/repos/bar/.git 62repo.path=$PWD/trash/repos/bar/.git
63repo.desc=the bar repo 63repo.desc=the bar repo
64EOF 64EOF
65} 65}
66 66
67prepare_tests() 67prepare_tests()
68{ 68{
69 setup_repos 69 setup_repos
70 test_count=0 70 test_count=0
71 test_failed=0 71 test_failed=0
72 echo "$@" "($0)" 72 echo "$@" "($0)"
73} 73}
74 74
75tests_done() 75tests_done()
76{ 76{
77 printf "\n" 77 printf "\n"
78 if test $test_failed -gt 0 78 if test $test_failed -gt 0
79 then 79 then
80 printf "[%s of %s tests failed]\n" $test_failed $test_count 80 printf "[%s of %s tests failed]\n" $test_failed $test_count
81 false 81 false
82 fi 82 fi
83} 83}
84 84
85run_test() 85run_test()
86{ 86{
87 desc=$1 87 desc=$1
88 script=$2 88 script=$2
89 ((test_count++)) 89 ((test_count++))
90 eval "$2" >test-output.log 90 eval "$2" >test-output.log
91 res=$? 91 res=$?
92 if test $res = 0 92 if test $res = 0
93 then 93 then
94 printf " %s: ok - %s\n" $test_count "$desc" 94 printf " %2d) %-60s [ok]\n" $test_count "$desc"
95 else 95 else
96 ((test_failed++)) 96 ((test_failed++))
97 printf " %s: fail - %s\n" $test_count "$desc" 97 printf " %2d) %-60s [failed]\n" $test_count "$desc"
98 fi 98 fi
99} 99}
100 100
101cgit_query() 101cgit_query()
102{ 102{
103 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" 103 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
104} 104}
105 105
106cgit_url() 106cgit_url()
107{ 107{
108 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" 108 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
109} 109}
110 110