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
@@ -9,97 +9,99 @@
 #   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'
 
 
 mkrepo() {
         name=$1
         count=$2
         dir=$PWD
         test -d $name && return
         printf "Creating testrepo %s\n" $name
         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=$?
         if test $res = 0
         then
                 printf "  %s: ok - %s\n" $test_count "$desc"
         else
                 ((test_failed++))
                 printf "  %s: fail - %s\n" $test_count "$desc"
         fi
 }
 
 cgit_query()
 {
         CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
 }
 
 cgit_url()
 {
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