author | Ferry 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) |
commit | 877ff681007f31c69777e9569c4de819d4af19c9 (patch) (side-by-side diff) | |
tree | 019148a1c41c23719f9ce7f1ededd6a86042501d /tests/setup.sh | |
parent | 9900ac022edfcfacee317d19a0f1d4d03b837b43 (diff) | |
download | cgit-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>
-rwxr-xr-x | tests/setup.sh | 1 |
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,146 +1,147 @@ # 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 mkrepo trash/repos/foo 5 >/dev/null mkrepo trash/repos/bar 50 >/dev/null mkrepo trash/repos/foo+bar 10 testplus >/dev/null mkrepo "trash/repos/with space" 2 >/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 summary-log=5 summary-branches=5 summary-tags=5 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 repo.url=with space repo.path=$PWD/trash/repos/with space/.git repo.desc=spaced repo EOF } prepare_tests() { setup_repos rm -f test-output.log 2>/dev/null test_count=0 test_failed=0 echo "[$0]" "$@" >test-output.log echo "$@" "($0)" } tests_done() { printf "\n" if test $test_failed -gt 0 then printf "test: *** %s failure(s), logfile=%s\n" \ $test_failed "$(pwd)/test-output.log" false fi } run_test() { bug=0 if test "$1" = "BUG" then bug=1 shift fi desc=$1 script=$2 test_count=$(expr $test_count + 1) printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log eval "$2" >>test-output.log 2>>test-output.log res=$? printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log if test $res = 0 -a $bug = 0 then printf " %2d) %-60s [ok]\n" $test_count "$desc" elif test $res = 0 -a $bug = 1 then printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc" elif test $bug = 1 then printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc" else test_failed=$(expr $test_failed + 1) printf " %2d) %-60s [failed]\n" $test_count "$desc" fi } 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" } |