summaryrefslogtreecommitdiffabout
path: root/tests/setup.sh
Side-by-side diff
Diffstat (limited to 'tests/setup.sh') (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/setup.sh13
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
@@ -26,25 +26,33 @@ mkrepo() {
cd $name
git init
for ((n=1; n<=count; n++))
do
echo $n >file-$n
git add file-$n
git commit -m "commit $n"
done
+ 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()
{
rm -rf trash/cache
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
cat >trash/cgitrc <<EOF
virtual-root=/
cache-root=$PWD/trash/cache
cache-size=1021
snapshots=tar.gz tar.bz zip
enable-log-filecount=1
enable-log-linecount=1
@@ -56,16 +64,20 @@ repo.url=foo
repo.path=$PWD/trash/repos/foo/.git
# Do not specify a description for this repo, as it then will be assigned
# the constant value "[no description]" (which actually used to cause a
# segfault).
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
EOF
}
prepare_tests()
{
setup_repos
rm -f test-output.log 2>/dev/null
test_count=0
@@ -108,9 +120,8 @@ cgit_query()
{
CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
}
cgit_url()
{
CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
}
-