about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-02-24 19:43:46 +0100
committerLars Hjemli <hjemli@gmail.com>2008-02-24 19:53:08 +0100
commit20cdffd5e086ebfb8ba6a82ab98ab27276657111 (patch)
tree3d6b33855468682275a2580d09ba5c6c24726fa9
parentMake output from `make test` more readable (diff)
downloadcgit-pink-20cdffd5e086ebfb8ba6a82ab98ab27276657111.tar.gz
cgit-pink-20cdffd5e086ebfb8ba6a82ab98ab27276657111.zip
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>
-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
@@ -7,9 +7,12 @@ 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