Merge branch 'stable'

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
@@ -104,25 +104,25 @@ 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