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) (unidiff)
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) (ignore 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,41 +1,42 @@
1# This file should be sourced by all test-scripts 1# This file should be sourced by all test-scripts
2# 2#
3# Main functions: 3# Main functions:
4# prepare_tests(description) - setup for testing, i.e. create repos+config 4# prepare_tests(description) - setup for testing, i.e. create repos+config
5# run_test(description, script) - run one test, i.e. eval script 5# run_test(description, script) - run one test, i.e. eval script
6# 6#
7# Helper functions 7# Helper functions
8# cgit_query(querystring) - call cgit with the specified querystring 8# cgit_query(querystring) - call cgit with the specified querystring
9# cgit_url(url) - call cgit with the specified virtual url 9# cgit_url(url) - call cgit with the specified virtual url
10# 10#
11# Example script: 11# Example script:
12# 12#
13# . setup.sh 13# . setup.sh
14# prepare_tests "html validation" 14# prepare_tests "html validation"
15# run_test 'repo index' 'cgit_url "/" | tidy -e' 15# run_test 'repo index' 'cgit_url "/" | tidy -e'
16# run_test 'repo summary' 'cgit_url "/foo" | tidy -e' 16# run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
17 17
18unset CDPATH
18 19
19mkrepo() { 20mkrepo() {
20 name=$1 21 name=$1
21 count=$2 22 count=$2
22 dir=$PWD 23 dir=$PWD
23 test -d "$name" && return 24 test -d "$name" && return
24 printf "Creating testrepo %s\n" $name 25 printf "Creating testrepo %s\n" $name
25 mkdir -p "$name" 26 mkdir -p "$name"
26 cd "$name" 27 cd "$name"
27 git init 28 git init
28 n=1 29 n=1
29 while test $n -le $count 30 while test $n -le $count
30 do 31 do
31 echo $n >file-$n 32 echo $n >file-$n
32 git add file-$n 33 git add file-$n
33 git commit -m "commit $n" 34 git commit -m "commit $n"
34 n=$(expr $n + 1) 35 n=$(expr $n + 1)
35 done 36 done
36 if test "$3" = "testplus" 37 if test "$3" = "testplus"
37 then 38 then
38 echo "hello" >a+b 39 echo "hello" >a+b
39 git add a+b 40 git add a+b
40 git commit -m "add a+b" 41 git commit -m "add a+b"
41 git branch "1+2" 42 git branch "1+2"