Merge branch 'stable'

[cgit.git] / tests / t0010-validate-html.sh

diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh
index 907a415bda3bd65670058be4fc28ac93f4124a05..3fe4800ecf7b6fceb3d84b5102bc25152e786ce1 100755 (executable)
--- a/tests/t0010-validate-html.sh
+++ b/tests/t0010-validate-html.sh
@@ -7,9 +7,12 @@ test_url()
 {
        tidy_opt="-eq"
        test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
-       cgit_url "$1" | sed -e "1,4d" >trash/tidy-$test_count
-       tidy $tidy_opt trash/tidy-$test_count
+       cgit_url "$1" >trash/tidy-$test_count || return
+       sed -ie "1,4d" trash/tidy-$test_count || return
+       "$tidy" $tidy_opt trash/tidy-$test_count
        rc=$?
+
+       # tidy returns with exitcode 1 on warnings, 2 on error
        if test $rc = 2
        then
                false
@@ -20,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"'