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) (unidiff) | |
tree | 019148a1c41c23719f9ce7f1ededd6a86042501d | |
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 @@ | |||
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 | ||
18 | unset CDPATH | ||
18 | 19 | ||
19 | mkrepo() { | 20 | mkrepo() { |
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" |
42 | fi | 43 | fi |
43 | cd $dir | 44 | cd $dir |
44 | } | 45 | } |
45 | 46 | ||
46 | setup_repos() | 47 | setup_repos() |
47 | { | 48 | { |
48 | rm -rf trash/cache | 49 | rm -rf trash/cache |
49 | mkdir -p trash/cache | 50 | mkdir -p trash/cache |
50 | mkrepo trash/repos/foo 5 >/dev/null | 51 | mkrepo trash/repos/foo 5 >/dev/null |
51 | mkrepo trash/repos/bar 50 >/dev/null | 52 | mkrepo trash/repos/bar 50 >/dev/null |
52 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null | 53 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null |
53 | mkrepo "trash/repos/with space" 2 >/dev/null | 54 | mkrepo "trash/repos/with space" 2 >/dev/null |
54 | cat >trash/cgitrc <<EOF | 55 | cat >trash/cgitrc <<EOF |
55 | virtual-root=/ | 56 | virtual-root=/ |
56 | cache-root=$PWD/trash/cache | 57 | cache-root=$PWD/trash/cache |
57 | 58 | ||
58 | cache-size=1021 | 59 | cache-size=1021 |
59 | snapshots=tar.gz tar.bz zip | 60 | snapshots=tar.gz tar.bz zip |
60 | enable-log-filecount=1 | 61 | enable-log-filecount=1 |
61 | enable-log-linecount=1 | 62 | enable-log-linecount=1 |
62 | summary-log=5 | 63 | summary-log=5 |
63 | summary-branches=5 | 64 | summary-branches=5 |
64 | summary-tags=5 | 65 | summary-tags=5 |
65 | 66 | ||
66 | repo.url=foo | 67 | repo.url=foo |
67 | repo.path=$PWD/trash/repos/foo/.git | 68 | repo.path=$PWD/trash/repos/foo/.git |
68 | # Do not specify a description for this repo, as it then will be assigned | 69 | # Do not specify a description for this repo, as it then will be assigned |
69 | # the constant value "[no description]" (which actually used to cause a | 70 | # the constant value "[no description]" (which actually used to cause a |
70 | # segfault). | 71 | # segfault). |
71 | 72 | ||
72 | repo.url=bar | 73 | repo.url=bar |
73 | repo.path=$PWD/trash/repos/bar/.git | 74 | repo.path=$PWD/trash/repos/bar/.git |
74 | repo.desc=the bar repo | 75 | repo.desc=the bar repo |
75 | 76 | ||
76 | repo.url=foo+bar | 77 | repo.url=foo+bar |
77 | repo.path=$PWD/trash/repos/foo+bar/.git | 78 | repo.path=$PWD/trash/repos/foo+bar/.git |
78 | repo.desc=the foo+bar repo | 79 | repo.desc=the foo+bar repo |
79 | 80 | ||
80 | repo.url=with space | 81 | repo.url=with space |
81 | repo.path=$PWD/trash/repos/with space/.git | 82 | repo.path=$PWD/trash/repos/with space/.git |
82 | repo.desc=spaced repo | 83 | repo.desc=spaced repo |
83 | EOF | 84 | EOF |
84 | } | 85 | } |
85 | 86 | ||
86 | prepare_tests() | 87 | prepare_tests() |
87 | { | 88 | { |
88 | setup_repos | 89 | setup_repos |
89 | rm -f test-output.log 2>/dev/null | 90 | rm -f test-output.log 2>/dev/null |
90 | test_count=0 | 91 | test_count=0 |
91 | test_failed=0 | 92 | test_failed=0 |
92 | echo "[$0]" "$@" >test-output.log | 93 | echo "[$0]" "$@" >test-output.log |
93 | echo "$@" "($0)" | 94 | echo "$@" "($0)" |
94 | } | 95 | } |
95 | 96 | ||
96 | tests_done() | 97 | tests_done() |
97 | { | 98 | { |
98 | printf "\n" | 99 | printf "\n" |
99 | if test $test_failed -gt 0 | 100 | if test $test_failed -gt 0 |
100 | then | 101 | then |
101 | printf "test: *** %s failure(s), logfile=%s\n" \ | 102 | printf "test: *** %s failure(s), logfile=%s\n" \ |
102 | $test_failed "$(pwd)/test-output.log" | 103 | $test_failed "$(pwd)/test-output.log" |
103 | false | 104 | false |
104 | fi | 105 | fi |
105 | } | 106 | } |
106 | 107 | ||
107 | run_test() | 108 | run_test() |
108 | { | 109 | { |
109 | bug=0 | 110 | bug=0 |
110 | if test "$1" = "BUG" | 111 | if test "$1" = "BUG" |
111 | then | 112 | then |
112 | bug=1 | 113 | bug=1 |
113 | shift | 114 | shift |
114 | fi | 115 | fi |
115 | desc=$1 | 116 | desc=$1 |
116 | script=$2 | 117 | script=$2 |
117 | test_count=$(expr $test_count + 1) | 118 | test_count=$(expr $test_count + 1) |
118 | printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log | 119 | printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log |
119 | printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log | 120 | printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log |
120 | eval "$2" >>test-output.log 2>>test-output.log | 121 | eval "$2" >>test-output.log 2>>test-output.log |
121 | res=$? | 122 | res=$? |
122 | printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log | 123 | printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log |
123 | if test $res = 0 -a $bug = 0 | 124 | if test $res = 0 -a $bug = 0 |
124 | then | 125 | then |
125 | printf " %2d) %-60s [ok]\n" $test_count "$desc" | 126 | printf " %2d) %-60s [ok]\n" $test_count "$desc" |
126 | elif test $res = 0 -a $bug = 1 | 127 | elif test $res = 0 -a $bug = 1 |
127 | then | 128 | then |
128 | printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc" | 129 | printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc" |
129 | elif test $bug = 1 | 130 | elif test $bug = 1 |
130 | then | 131 | then |
131 | printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc" | 132 | printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc" |
132 | else | 133 | else |
133 | test_failed=$(expr $test_failed + 1) | 134 | test_failed=$(expr $test_failed + 1) |
134 | printf " %2d) %-60s [failed]\n" $test_count "$desc" | 135 | printf " %2d) %-60s [failed]\n" $test_count "$desc" |
135 | fi | 136 | fi |
136 | } | 137 | } |
137 | 138 | ||
138 | cgit_query() | 139 | cgit_query() |
139 | { | 140 | { |
140 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | 141 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" |
141 | } | 142 | } |
142 | 143 | ||
143 | cgit_url() | 144 | cgit_url() |
144 | { | 145 | { |
145 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | 146 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" |
146 | } | 147 | } |