From 86c5e63d7cccacc5388b0e2fa4cbd22191e4ca3b Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Fri, 5 Mar 2010 23:07:06 +0100 Subject: Skip XHTML validation if xmllint or DTD are missing. --- NEWS | 1 + t.validate-xhtml | 9 +++++++++ 2 files changed, 10 insertions(+) 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 + + + + </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" ; } -- cgit v1.2.3