author | Lars Hjemli <hjemli@gmail.com> | 2009-01-06 20:37:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-06 20:37:23 (UTC) |
commit | f3c99cf1cee25ae95ffea6188b40734e877bce20 (patch) (unidiff) | |
tree | 6b996b4b1e8da4b8b56c8022036d5dce6d2d5e7f /tests | |
parent | 03afc5fe1fe70b6e44b60708c89708060e6d5a90 (diff) | |
download | cgit-f3c99cf1cee25ae95ffea6188b40734e877bce20.zip cgit-f3c99cf1cee25ae95ffea6188b40734e877bce20.tar.gz cgit-f3c99cf1cee25ae95ffea6188b40734e877bce20.tar.bz2 |
ui-tree.c: do not add blank line when displaying blobs
Also, fix a related bug in the test-suite.
Noticed-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/t0104-tree.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh index 0d62cc8..33f4eb0 100755 --- a/tests/t0104-tree.sh +++ b/tests/t0104-tree.sh | |||
@@ -1,33 +1,33 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on tree page" | 5 | prepare_tests "Check content on tree page" |
6 | 6 | ||
7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' | 7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' |
8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' | 8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' |
9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' | 9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' |
10 | 10 | ||
11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' | 11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' |
12 | 12 | ||
13 | run_test 'find line 1' ' | 13 | run_test 'find line 1' ' |
14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp | 14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp |
15 | ' | 15 | ' |
16 | 16 | ||
17 | run_test 'no line 2' ' | 17 | run_test 'no line 2' ' |
18 | grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp | 18 | ! grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp |
19 | ' | 19 | ' |
20 | 20 | ||
21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' | 21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' |
22 | 22 | ||
23 | run_test 'verify a+b link' ' | 23 | run_test 'verify a+b link' ' |
24 | grep -e "/foo+bar/tree/a+b" trash/tmp | 24 | grep -e "/foo+bar/tree/a+b" trash/tmp |
25 | ' | 25 | ' |
26 | 26 | ||
27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' | 27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' |
28 | 28 | ||
29 | run_test 'verify a+b?h=1+2 link' ' | 29 | run_test 'verify a+b?h=1+2 link' ' |
30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp | 30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp |
31 | ' | 31 | ' |
32 | 32 | ||
33 | tests_done | 33 | tests_done |