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
@@ -113,7 +113,7 @@ run_test()
         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
 }
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
@@ -9,7 +9,7 @@ test_url()
         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
@@ -23,6 +23,13 @@ test_url()
 
 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"'