author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:53:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:53:59 (UTC) |
commit | 2755af6e29801ea10b5d7be6a0a5635ba3bc9660 (patch) (unidiff) | |
tree | eaa044791005992901b46f0b41b422327a9ac58b | |
parent | d2592a2cb5ca202d9825d8f1ca6f4a712ea8fe2b (diff) | |
download | cgit-2755af6e29801ea10b5d7be6a0a5635ba3bc9660.zip cgit-2755af6e29801ea10b5d7be6a0a5635ba3bc9660.tar.gz cgit-2755af6e29801ea10b5d7be6a0a5635ba3bc9660.tar.bz2 |
tests/t0010-validate-html.sh: skip tests if 'tidy' is not available
Noticed-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/t0010-validate-html.sh | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
@@ -1,34 +1,41 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | 5 | ||
6 | test_url() | 6 | test_url() |
7 | { | 7 | { |
8 | tidy_opt="-eq" | 8 | tidy_opt="-eq" |
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 |
16 | if test $rc = 2 | 16 | if test $rc = 2 |
17 | then | 17 | then |
18 | false | 18 | false |
19 | else | 19 | else |
20 | : | 20 | : |
21 | fi | 21 | fi |
22 | } | 22 | } |
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"' |
29 | run_test 'foo/tree' 'test_url "foo/tree"' | 36 | run_test 'foo/tree' 'test_url "foo/tree"' |
30 | run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' | 37 | run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' |
31 | run_test 'foo/commit' 'test_url "foo/commit"' | 38 | run_test 'foo/commit' 'test_url "foo/commit"' |
32 | run_test 'foo/diff' 'test_url "foo/diff"' | 39 | run_test 'foo/diff' 'test_url "foo/diff"' |
33 | 40 | ||
34 | tests_done | 41 | tests_done |