aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2011-05-24 06:26:10 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2011-05-24 06:26:10 (JST)
commit652a5a18db3b0409fedfaf8c5720446d87628ba0 (patch)
treecefa386058d968217af24374b93972820a9b43a8 /tests
parent4837fddc35bbd8d6f66a40486f75cdee3197172d (diff)
parentec79265f2053e6dc20e0ec486719f5954d2be83d (diff)
downloadcgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.zip
cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.gz
Merge branch 'stable'
Diffstat (limited to 'tests')
-rwxr-xr-xtests/setup.sh25
-rwxr-xr-xtests/t0101-index.sh1
-rwxr-xr-xtests/t0103-log.sh10
3 files changed, 32 insertions, 4 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index 30f90d5..b2f1169 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -20,10 +20,10 @@ 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
@@ -50,6 +50,7 @@ setup_repos()
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 mkrepo "trash/repos/with space" 2 >/dev/null
53 cat >trash/cgitrc <<EOF 54 cat >trash/cgitrc <<EOF
54virtual-root=/ 55virtual-root=/
55cache-root=$PWD/trash/cache 56cache-root=$PWD/trash/cache
@@ -75,6 +76,10 @@ repo.desc=the bar repo
75repo.url=foo+bar 76repo.url=foo+bar
76repo.path=$PWD/trash/repos/foo+bar/.git 77repo.path=$PWD/trash/repos/foo+bar/.git
77repo.desc=the foo+bar repo 78repo.desc=the foo+bar repo
79
80repo.url=with space
81repo.path=$PWD/trash/repos/with space/.git
82repo.desc=spaced repo
78EOF 83EOF
79} 84}
80 85
@@ -101,6 +106,12 @@ tests_done()
101 106
102run_test() 107run_test()
103{ 108{
109 bug=0
110 if test "$1" = "BUG"
111 then
112 bug=1
113 shift
114 fi
104 desc=$1 115 desc=$1
105 script=$2 116 script=$2
106 test_count=$(expr $test_count + 1) 117 test_count=$(expr $test_count + 1)
@@ -109,9 +120,15 @@ run_test()
109 eval "$2" >>test-output.log 2>>test-output.log 120 eval "$2" >>test-output.log 2>>test-output.log
110 res=$? 121 res=$?
111 printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log 122 printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
112 if test $res = 0 123 if test $res = 0 -a $bug = 0
113 then 124 then
114 printf " %2d) %-60s [ok]\n" $test_count "$desc" 125 printf " %2d) %-60s [ok]\n" $test_count "$desc"
126 elif test $res = 0 -a $bug = 1
127 then
128 printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc"
129 elif test $bug = 1
130 then
131 printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc"
115 else 132 else
116 test_failed=$(expr $test_failed + 1) 133 test_failed=$(expr $test_failed + 1)
117 printf " %2d) %-60s [failed]\n" $test_count "$desc" 134 printf " %2d) %-60s [failed]\n" $test_count "$desc"
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh
index 07e39f9..573a351 100755
--- a/tests/t0101-index.sh
+++ b/tests/t0101-index.sh
@@ -11,6 +11,7 @@ run_test 'find bar repo' 'grep -e "bar" trash/tmp'
11run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' 11run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
12run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp' 12run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp'
13run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp' 13run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp'
14run_test 'verify "with%20space" link' 'grep -e "/with%20space/" trash/tmp'
14run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' 15run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp'
15run_test 'no log-link' '! grep -e "foo/log" trash/tmp' 16run_test 'no log-link' '! grep -e "foo/log" trash/tmp'
16 17
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh
index b08cd29..def5c18 100755
--- a/tests/t0103-log.sh
+++ b/tests/t0103-log.sh
@@ -12,4 +12,14 @@ run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp'
12run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' 12run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
13run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' 13run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
14 14
15run_test 'generate "with%20space/log?qt=grep&q=commit+1"' '
16 cgit_url "with+space/log&qt=grep&q=commit+1" >trash/tmp
17'
18run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
19run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp'
20run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp'
21run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp'
22run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp'
23run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp'
24
15tests_done 25tests_done