aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2010-03-05 23:07:06 +0100
committerMatthias Andree <matthias.andree@gmx.de>2010-03-05 23:07:06 +0100
commit86c5e63d7cccacc5388b0e2fa4cbd22191e4ca3b (patch)
tree0b48bd0685fe74f0e7a312a090ad70d89c3e3dfb
parentc116e68a05e2feb9a0c8e735aab097ef5ea1dfb3 (diff)
downloadfetchmail-86c5e63d7cccacc5388b0e2fa4cbd22191e4ca3b.tar.gz
fetchmail-86c5e63d7cccacc5388b0e2fa4cbd22191e4ca3b.tar.bz2
fetchmail-86c5e63d7cccacc5388b0e2fa4cbd22191e4ca3b.zip
Skip XHTML validation if xmllint or DTD are missing.
-rw-r--r--NEWS1
-rwxr-xr-xt.validate-xhtml9
2 files changed, 10 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 3b698e7f..7b5a7604 100644
--- a/NEWS
+++ b/NEWS
@@ -79,6 +79,7 @@ fetchmail 6.3.15 (not yet released):
* The outdated SVN trunk is now called "oldtrunk" in Git just to save the work
for future reference. All development in the past few years was on BRANCH_6-3.
* master was branched from BRANCH_6-3 for user convenience.
+* "make check" now skips HTML validation if xmllint or XHTML DTD are missing.
# DOCUMENTATION
* Web site and documentation were adjusted to reflect the SVN->Git move.
diff --git a/t.validate-xhtml b/t.validate-xhtml
index d66fc98f..bf55f4fb 100755
--- a/t.validate-xhtml
+++ b/t.validate-xhtml
@@ -6,6 +6,15 @@ set -eu
e=0
fail=
IFS=$(printf '\n\t')
+
+# smoke test validator and skip if it fails
+cat - <<'_EOF' | xmllint 2>/dev/null --nonet --postvalid --noout - || exit 77
+<?xml version="1.0" encoding="US-ASCII"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head><title /></head><body></body></html>
+_EOF
+
for i in "${srcdir}"/*.html ; do
case "$i" in */fetchmail-man.html) continue ;; esac
xmllint --postvalid --noout "$i" || { e=1 ; fail="$i${fail:+" "}$fail" ; }