author | Lars Hjemli <hjemli@gmail.com> | 2008-02-24 14:27:33 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-02-24 14:27:33 (UTC) |
commit | 19134112bf942c0492f2095b668ea31c1a498f1a (patch) (unidiff) | |
tree | b41e1a3a1a80b82b62fa7c5355526dd4b309cae4 | |
parent | e0572c39f78b4f88c706a49a60e211302b8e015c (diff) | |
download | cgit-19134112bf942c0492f2095b668ea31c1a498f1a.zip cgit-19134112bf942c0492f2095b668ea31c1a498f1a.tar.gz cgit-19134112bf942c0492f2095b668ea31c1a498f1a.tar.bz2 |
Add regression-test for description-less repos
The segfault fixed in commit eacde43d7184452e1fdc90b982b531f1f5239923 was
triggered when the html-functions manipulated string literals. One callpatch
which could trigger the bug is in ui-repolist.c when repo descriptions are
passed to html_ntxt(): if a repo is lacking a description, the literal
string "[no description]" is used.
This patch changes test/setup.sh such that the first repo has no description,
and adds tests for both "[no description]" and "the bar repo" (description
of the other repo) to tests/t0101-index.sh, which should be enought to catch
regressions in these functions.
Noticed-by: Hiroki Hattori <seagull.kamome@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/setup.sh | 4 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 51d5a75..9bb1f12 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -45,25 +45,27 @@ virtual-root=/ | |||
45 | cache-root=$PWD/trash/cache | 45 | cache-root=$PWD/trash/cache |
46 | 46 | ||
47 | nocache=0 | 47 | nocache=0 |
48 | snapshots=tar.gz tar.bz zip | 48 | snapshots=tar.gz tar.bz zip |
49 | enable-log-filecount=1 | 49 | enable-log-filecount=1 |
50 | enable-log-linecount=1 | 50 | enable-log-linecount=1 |
51 | summary-log=5 | 51 | summary-log=5 |
52 | summary-branches=5 | 52 | summary-branches=5 |
53 | summary-tags=5 | 53 | summary-tags=5 |
54 | 54 | ||
55 | repo.url=foo | 55 | repo.url=foo |
56 | repo.path=$PWD/trash/repos/foo/.git | 56 | repo.path=$PWD/trash/repos/foo/.git |
57 | repo.desc=the foo repo | 57 | # Do not specify a description for this repo, as it then will be assigned |
58 | # the constant value "[no description]" (which actually used to cause a | ||
59 | # segfault). | ||
58 | 60 | ||
59 | repo.url=bar | 61 | repo.url=bar |
60 | repo.path=$PWD/trash/repos/bar/.git | 62 | repo.path=$PWD/trash/repos/bar/.git |
61 | repo.desc=the bar repo | 63 | repo.desc=the bar repo |
62 | EOF | 64 | EOF |
63 | } | 65 | } |
64 | 66 | ||
65 | prepare_tests() | 67 | prepare_tests() |
66 | { | 68 | { |
67 | setup_repos | 69 | setup_repos |
68 | test_count=0 | 70 | test_count=0 |
69 | test_failed=0 | 71 | test_failed=0 |
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh index 12ed00c..59edc59 100755 --- a/tests/t0101-index.sh +++ b/tests/t0101-index.sh | |||
@@ -1,13 +1,15 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on index page" | 5 | prepare_tests "Check content on index page" |
6 | 6 | ||
7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' | 7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' |
8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' | 8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' |
9 | run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' | ||
9 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' | 10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' |
11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' | ||
10 | run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp' | 12 | run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp' |
11 | run_test 'no log-link' 'grep -ve "foo/log" trash/tmp' | 13 | run_test 'no log-link' 'grep -ve "foo/log" trash/tmp' |
12 | 14 | ||
13 | tests_done | 15 | tests_done |