crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2008-12-06 12:05:21 +01:00
commit 11456a60de
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/setup.sh
View File

@ -113,7 +113,7 @@ run_test()
then then
printf " %2d) %-60s [ok]\n" $test_count "$desc" printf " %2d) %-60s [ok]\n" $test_count "$desc"
else else
((test_failed++)) test_failed=$(expr $test_failed + 1)
printf " %2d) %-60s [failed]\n" $test_count "$desc" printf " %2d) %-60s [failed]\n" $test_count "$desc"
fi fi
} }

9
tests/t0010-validate-html.sh
View File

@ -9,7 +9,7 @@ test_url()
test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
cgit_url "$1" >trash/tidy-$test_count || return cgit_url "$1" >trash/tidy-$test_count || return
sed -ie "1,4d" 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=$? rc=$?
# tidy returns with exitcode 1 on warnings, 2 on error # tidy returns with exitcode 1 on warnings, 2 on error
@ -23,6 +23,13 @@ test_url()
prepare_tests 'Validate html with tidy' 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 'index page' 'test_url ""'
run_test 'foo' 'test_url "foo"' run_test 'foo' 'test_url "foo"'
run_test 'foo/log' 'test_url "foo/log"' run_test 'foo/log' 'test_url "foo/log"'