2 files changed, 9 insertions, 2 deletions

diff --git a/tests/setup.sh b/tests/setup.sh
index 95acb54..30f90d5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -1,129 +1,129 @@
 # This file should be sourced by all test-scripts
 #
 # Main functions:
 #   prepare_tests(description) - setup for testing, i.e. create repos+config
 #   run_test(description, script) - run one test, i.e. eval script
 #
 # Helper functions
 #   cgit_query(querystring) - call cgit with the specified querystring
 #   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
         n=1
         while test $n -le $count
         do
                 echo $n >file-$n
                 git add file-$n
                 git commit -m "commit $n"
                 n=$(expr $n + 1)
         done
         if test "$3" = "testplus"
         then
                 echo "hello" >a+b
                 git add a+b
                 git commit -m "add a+b"
                 git branch "1+2"
         fi
         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
         mkrepo trash/repos/foo+bar 10 testplus >/dev/null
         cat >trash/cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/trash/cache
 
 cache-size=1021
 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
 # 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
 
 repo.url=foo+bar
 repo.path=$PWD/trash/repos/foo+bar/.git
 repo.desc=the foo+bar repo
 EOF
 }
 
 prepare_tests()
 {
         setup_repos
         rm -f test-output.log 2>/dev/null
         test_count=0
         test_failed=0
         echo "[$0]" "$@" >test-output.log
         echo "$@" "($0)"
 }
 
 tests_done()
 {
         printf "\n"
         if test $test_failed -gt 0
         then
                 printf "test: *** %s failure(s), logfile=%s\n" \
                         $test_failed "$(pwd)/test-output.log"
                 false
         fi
 }
 
 run_test()
 {
         desc=$1
         script=$2
         test_count=$(expr $test_count + 1)
         printf "\ntest %d: name='%s'\n" $test_count "$desc" >>test-output.log
         printf "test %d: eval='%s'\n" $test_count "$2" >>test-output.log
         eval "$2" >>test-output.log 2>>test-output.log
         res=$?
         printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
         if test $res = 0
         then
                 printf " %2d) %-60s [ok]\n" $test_count "$desc"
         else
-                ((test_failed++))
+                test_failed=$(expr $test_failed + 1)
                 printf " %2d) %-60s [failed]\n" $test_count "$desc"
         fi
 }
 
 cgit_query()
 {
         CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
 }
 
 cgit_url()
 {
         CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh
index 94aa52b..3fe4800 100755
--- a/tests/t0010-validate-html.sh
+++ b/tests/t0010-validate-html.sh
@@ -1,34 +1,41 @@
 #!/bin/sh
 
 . ./setup.sh
 
 
 test_url()
 {
         tidy_opt="-eq"
         test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
         cgit_url "$1" >trash/tidy-$test_count || return
         sed -ie "1,4d" trash/tidy-$test_count || return
-        tidy $tidy_opt trash/tidy-$test_count
+        "$tidy" $tidy_opt trash/tidy-$test_count
         rc=$?
 
         # tidy returns with exitcode 1 on warnings, 2 on error
         if test $rc = 2
         then
                 false
         else
                 :
         fi
 }
 
 prepare_tests 'Validate html with tidy'
 
+tidy=`which tidy`
+test -n "$tidy" || {
+        echo "Skipping tests: tidy not found"
+        tests_done
+        exit
+}
+
 run_test 'index page' 'test_url ""'
 run_test 'foo' 'test_url "foo"'
 run_test 'foo/log' 'test_url "foo/log"'
 run_test 'foo/tree' 'test_url "foo/tree"'
 run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"'
 run_test 'foo/commit' 'test_url "foo/commit"'
 run_test 'foo/diff' 'test_url "foo/diff"'
 
 tests_done