From 2755af6e29801ea10b5d7be6a0a5635ba3bc9660 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 6 Dec 2008 11:53:59 +0100 Subject: tests/t0010-validate-html.sh: skip tests if 'tidy' is not available Noticed-by: Ramsay Jones Signed-off-by: Lars Hjemli --- tests/t0010-validate-html.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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() 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 @@ -23,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"' -- cgit v1.2.3-70-g09d2 From b6faa78091a1340b73e291f1f87604f246d3f391 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 6 Dec 2008 12:03:54 +0100 Subject: tests/setup.sh: allow testsuite to fail properly with POSIX standard shells The "((expr))" construct is not implemented by e.g. dash, so this commit replaces the construct with a more portable one. Signed-off-by: Lars Hjemli --- tests/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() 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 } -- cgit v1.2.3-70-g09d2 '>
Commit message (Expand)AuthorFilesLines
2008-01-20 r687@Devoty: necoro | 2008-01-20 13:56:53 +0100Necoro1-2/+2
2008-01-20 r686@Devoty: necoro | 2008-01-20 04:50:27 +0100Necoro1-2/+3
2008-01-20 r682@Devoty: necoro | 2008-01-20 03:23:02 +0100Necoro2-5/+5
2008-01-20 r680@Devoty: necoro | 2008-01-20 02:53:30 +0100Necoro7-55/+100
2008-01-19 r675@Devoty: necoro | 2008-01-19 23:33:38 +0100Necoro2-366/+396
2008-01-18 r669@Devoty: necoro | 2008-01-18 22:49:33 +0100Necoro1-6/+6
2008-01-18 r664@Devoty: necoro | 2008-01-18 21:40:29 +0100Necoro5-26/+181
2008-01-18 r661@Devoty: necoro | 2008-01-18 14:16:59 +0100Necoro8-211/+293
2008-01-18 r655@Devoty: necoro | 2008-01-18 03:04:53 +0100Necoro1-1/+1
2008-01-18 r651@Devoty: necoro | 2008-01-18 02:41:51 +0100Necoro3-393/+513
2008-01-18 r643@Devoty: necoro | 2008-01-16 18:55:49 +0100Necoro14-249/+525
2008-01-14 r634@Devoty: necoro | 2008-01-14 23:48:24 +0100Necoro3-1/+4
2008-01-14 r632@Devoty: necoro | 2008-01-14 23:44:52 +0100Necoro3-175/+181
2008-01-14(no commit message)Necoro10-758/+1014
2008-01-14 r621@Devoty: necoro | 2008-01-14 20:21:40 +0100Necoro2-21/+61
2008-01-14 r618@Devoty: necoro | 2008-01-14 20:19:05 +0100Necoro2-35/+57
2008-01-14 r617@Devoty: necoro | 2008-01-14 19:12:59 +0100Necoro2-10/+10
2008-01-14 r609@Devoty: necoro | 2008-01-14 17:04:38 +0100Necoro9-394/+477
2008-01-14 r605@Devoty: necoro | 2008-01-14 11:43:34 +0100Necoro2-26/+129
2008-01-14 r603@Devoty: necoro | 2008-01-14 11:30:26 +0100Necoro4-26/+38
2008-01-11 r598@Devoty: necoro | 2008-01-10 16:36:29 +0100Necoro4-10/+50
2008-01-11 r597@Devoty: necoro | 2008-01-10 14:12:35 +0100Necoro1-3/+3
2008-01-10 r595@Devoty: necoro | 2008-01-10 04:04:15 +0100Necoro1-52/+3
2008-01-09 r586@Devoty: necoro | 2008-01-09 14:54:18 +0100Necoro1-1/+1
2007-12-06 r577@Devoty: necoro | 2007-12-06 20:37:36 +0100Necoro1-1/+1
2007-12-06 r572@Devoty: necoro | 2007-11-28 08:48:15 +0100Necoro1-0/+1
2007-11-27 r570@Devoty: necoro | 2007-11-27 02:08:21 +0100Necoro3-84/+108