summaryrefslogtreecommitdiffabout
authorFerry Huberts <ferry.huberts@pelagic.nl>2011-07-21 12:43:54 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-07-21 12:48:37 (UTC)
commit877ff681007f31c69777e9569c4de819d4af19c9 (patch) (side-by-side diff)
tree019148a1c41c23719f9ce7f1ededd6a86042501d
parent9900ac022edfcfacee317d19a0f1d4d03b837b43 (diff)
downloadcgit-877ff681007f31c69777e9569c4de819d4af19c9.zip
cgit-877ff681007f31c69777e9569c4de819d4af19c9.tar.gz
cgit-877ff681007f31c69777e9569c4de819d4af19c9.tar.bz2
tests: fix failures when CDPATH is set
Some tests would otherwise fail because commands such as cd trash/repos/foo && git rev-list --reverse HEAD | head -1 would return 2 lines instead of 1: the 'cd' command also prints the path when CDPATH is set. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xtests/setup.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index b2f1169..b9475a3 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -1,49 +1,50 @@
# This file should be sourced by all test-scripts
#
# Main functions:
# prepare_tests(description) - setup for testing, i.e. create repos+config
# run_test(description, script) - run one test, i.e. eval script
#
# Helper functions
# cgit_query(querystring) - call cgit with the specified querystring
# cgit_url(url) - call cgit with the specified virtual url
#
# Example script:
#
# . setup.sh
# prepare_tests "html validation"
# run_test 'repo index' 'cgit_url "/" | tidy -e'
# run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
+unset CDPATH
mkrepo() {
name=$1
count=$2
dir=$PWD
test -d "$name" && return
printf "Creating testrepo %s\n" $name
mkdir -p "$name"
cd "$name"
git init
n=1
while test $n -le $count
do
echo $n >file-$n
git add file-$n
git commit -m "commit $n"
n=$(expr $n + 1)
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