-rwxr-xr-x | tests/setup.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index e37306e..1457dd5 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -30,8 +30,15 @@ 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 | if test "$3" = "testplus" | ||
35 | then | ||
36 | echo "hello" >a+b | ||
37 | git add a+b | ||
38 | git commit -m "add a+b" | ||
39 | git branch "1+2" | ||
40 | fi | ||
34 | cd $dir | 41 | cd $dir |
35 | } | 42 | } |
36 | 43 | ||
37 | setup_repos() | 44 | setup_repos() |
@@ -39,8 +46,9 @@ setup_repos() | |||
39 | rm -rf trash/cache | 46 | rm -rf trash/cache |
40 | mkdir -p trash/cache | 47 | mkdir -p trash/cache |
41 | mkrepo trash/repos/foo 5 >/dev/null | 48 | mkrepo trash/repos/foo 5 >/dev/null |
42 | mkrepo trash/repos/bar 50 >/dev/null | 49 | mkrepo trash/repos/bar 50 >/dev/null |
50 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null | ||
43 | cat >trash/cgitrc <<EOF | 51 | cat >trash/cgitrc <<EOF |
44 | virtual-root=/ | 52 | virtual-root=/ |
45 | cache-root=$PWD/trash/cache | 53 | cache-root=$PWD/trash/cache |
46 | 54 | ||
@@ -60,8 +68,12 @@ repo.path=$PWD/trash/repos/foo/.git | |||
60 | 68 | ||
61 | repo.url=bar | 69 | repo.url=bar |
62 | repo.path=$PWD/trash/repos/bar/.git | 70 | repo.path=$PWD/trash/repos/bar/.git |
63 | repo.desc=the bar repo | 71 | repo.desc=the bar repo |
72 | |||
73 | repo.url=foo+bar | ||
74 | repo.path=$PWD/trash/repos/foo+bar/.git | ||
75 | repo.desc=the foo+bar repo | ||
64 | EOF | 76 | EOF |
65 | } | 77 | } |
66 | 78 | ||
67 | prepare_tests() | 79 | prepare_tests() |
@@ -112,5 +124,4 @@ cgit_query() | |||
112 | cgit_url() | 124 | cgit_url() |
113 | { | 125 | { |
114 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 126 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
115 | } | 127 | } |
116 | |||