summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-02-24 18:43:46 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-02-24 18:53:08 (UTC)
commit20cdffd5e086ebfb8ba6a82ab98ab27276657111 (patch) (side-by-side diff)
tree3d6b33855468682275a2580d09ba5c6c24726fa9
parentb44b02a98253e78334f7fd13d9c4e1eb59562392 (diff)
downloadcgit-20cdffd5e086ebfb8ba6a82ab98ab27276657111.zip
cgit-20cdffd5e086ebfb8ba6a82ab98ab27276657111.tar.gz
cgit-20cdffd5e086ebfb8ba6a82ab98ab27276657111.tar.bz2
t0010-validate.sh: return on cgit errors
The earlier segfault in cgit passed by unnoticed by this test-script due to the pipe between cgit and sed. There might be a more elegant solution to this problem, but my shellscript- foo is weak. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/t0010-validate-html.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh
index 907a415..94aa52b 100755
--- a/tests/t0010-validate-html.sh
+++ b/tests/t0010-validate-html.sh
@@ -1,28 +1,31 @@
#!/bin/sh
. ./setup.sh
test_url()
{
tidy_opt="-eq"
test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
- cgit_url "$1" | sed -e "1,4d" >trash/tidy-$test_count
+ cgit_url "$1" >trash/tidy-$test_count || return
+ sed -ie "1,4d" trash/tidy-$test_count || return
tidy $tidy_opt trash/tidy-$test_count
rc=$?
+
+ # tidy returns with exitcode 1 on warnings, 2 on error
if test $rc = 2
then
false
else
:
fi
}
prepare_tests 'Validate html with tidy'
run_test 'index page' 'test_url ""'
run_test 'foo' 'test_url "foo"'
run_test 'foo/log' 'test_url "foo/log"'
run_test 'foo/tree' 'test_url "foo/tree"'
run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"'
run_test 'foo/commit' 'test_url "foo/commit"'