diff options
| author | Lars Hjemli | 2008-12-06 12:05:21 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2008-12-06 12:05:21 +0100 |
| commit | 11456a60deab19f5e3a1d191bdf48adfba9195e4 (patch) | |
| tree | d01ffde482a60e753bb32e6568c92c6b3e5a852b | |
| parent | Merge branch 'full-log' (diff) | |
| parent | tests/setup.sh: allow testsuite to fail properly with POSIX standard shells (diff) | |
| download | cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.tar.gz cgit-11456a60deab19f5e3a1d191bdf48adfba9195e4.zip | |
Merge branch 'stable'
| -rwxr-xr-x | tests/setup.sh | 2 | ||||
| -rwxr-xr-x | tests/t0010-validate-html.sh | 9 |
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() | |||
| 113 | then | 113 | then |
| 114 | printf " %2d) %-60s [ok]\n" $test_count "$desc" | 114 | printf " %2d) %-60s [ok]\n" $test_count "$desc" |
| 115 | else | 115 | else |
| 116 | ((test_failed++)) | 116 | test_failed=$(expr $test_failed + 1) |
| 117 | printf " %2d) %-60s [failed]\n" $test_count "$desc" | 117 | printf " %2d) %-60s [failed]\n" $test_count "$desc" |
| 118 | fi | 118 | fi |
| 119 | } | 119 | } |
| 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() | |||
| 9 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" | 9 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" |
| 10 | cgit_url "$1" >trash/tidy-$test_count || return | 10 | cgit_url "$1" >trash/tidy-$test_count || return |
| 11 | sed -ie "1,4d" trash/tidy-$test_count || return | 11 | sed -ie "1,4d" trash/tidy-$test_count || return |
| 12 | tidy $tidy_opt trash/tidy-$test_count | 12 | "$tidy" $tidy_opt trash/tidy-$test_count |
| 13 | rc=$? | 13 | rc=$? |
| 14 | 14 | ||
| 15 | # tidy returns with exitcode 1 on warnings, 2 on error | 15 | # tidy returns with exitcode 1 on warnings, 2 on error |
| @@ -23,6 +23,13 @@ test_url() | |||
| 23 | 23 | ||
| 24 | prepare_tests 'Validate html with tidy' | 24 | prepare_tests 'Validate html with tidy' |
| 25 | 25 | ||
| 26 | tidy=`which tidy` | ||
| 27 | test -n "$tidy" || { | ||
| 28 | echo "Skipping tests: tidy not found" | ||
| 29 | tests_done | ||
| 30 | exit | ||
| 31 | } | ||
| 32 | |||
| 26 | run_test 'index page' 'test_url ""' | 33 | run_test 'index page' 'test_url ""' |
| 27 | run_test 'foo' 'test_url "foo"' | 34 | run_test 'foo' 'test_url "foo"' |
| 28 | run_test 'foo/log' 'test_url "foo/log"' | 35 | run_test 'foo/log' 'test_url "foo/log"' |