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>

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
@@ -25,65 +25,67 @@ mkrepo() {
 	mkdir -p $name
 	cd $name
 	git init
 	for ((n=1; n<=count; n++))
 	do
 		echo $n >file-$n
 		git add file-$n
 		git commit -m "commit $n"
 	done
 	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
 	cat >trash/cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/trash/cache
 
 nocache=0
 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
-repo.desc=the foo repo
+# 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
 EOF
 }
 
 prepare_tests()
 {
 	setup_repos
 	test_count=0
 	test_failed=0
 	echo "$@" "($0)"
 }
 
 tests_done()
 {
 	printf "\n"
 	if test $test_failed -gt 0
 	then
 		printf "[%s of %s tests failed]\n" $test_failed $test_count
 		false
 	fi
 }
 
 run_test()
 {
 	desc=$1
 	script=$2
 	((test_count++))
 	eval "$2" >test-output.log
 	res=$?
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 @@
 #!/bin/sh
 
 . ./setup.sh
 
 prepare_tests "Check content on index page"
 
 run_test 'generate index page' 'cgit_url "" >trash/tmp'
 run_test 'find foo repo' 'grep -e "foo" trash/tmp'
+run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp'
 run_test 'find bar repo' 'grep -e "bar" trash/tmp'
+run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
 run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp'
 run_test 'no log-link' 'grep -ve "foo/log" trash/tmp'
 
 tests_done