Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Sat, 06 Dec 2008 12:05:21 +0100
2 files changed,
9 insertions(+),
2 deletions(-)
M
tests/setup.sh
→
tests/setup.sh
@@ -113,7 +113,7 @@ 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 }
M
tests/t0010-validate-html.sh
→
tests/t0010-validate-html.sh
@@ -9,7 +9,7 @@ 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@@ -22,6 +22,13 @@ 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"'