</head><body></body></html> -_EOF # ditto for XHTML 1.1 (asciidoc generates that) cat - <<'_EOF' | xmllint 2>/dev/null --nonet --postvalid --noout - || exit 77 <?xml version="1.0" encoding="US-ASCII"?> @@ -24,8 +17,8 @@ _EOF for i in "${srcdir}"/*.html ; do case "$i" in - */fetchmail-man.html) continue ;; -# */Mailbox-Names-UTF7.html) continue ;; + */Mailbox-Names-UTF7.html) ;; + *) continue ;; esac xmllint --postvalid --noout "$i" || { e=1 ; fail="$i${fail:+" "}$fail" ; } done diff --git a/t.validate-xhtml10 b/t.validate-xhtml10 new file mode 100755 index 00000000..a7cc9e6b --- /dev/null +++ b/t.validate-xhtml10 @@ -0,0 +1,28 @@ +#! /bin/sh + +# This test script validates all *.html files as XHTML. + +set -eu +e=0 +fail= +IFS=$(printf '\n\t') + +# smoke test validator for XHTML 1.0 Transitional, 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 ;; + */Mailbox-Names-UTF7.html) continue ;; + esac + xmllint --postvalid --noout "$i" || { e=1 ; fail="$i${fail:+" "}$fail" ; } +done +if [ $e != 0 ] ; then + echo >&2 ">>>>> Invalid XHTML in files: ${fail}." +fi +exit $e -- 2.43.2

From e4ef077fdad22286502ae485b7b8f7ca88fd49dd Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 1 Apr 2012 15:33:49 +0200 Subject: [PATCH] Validate XHTML 1.0 stuff even when skipping 1.1. --- Makefile.am | 2 +- t.validate-xhtml | 11 ++--------- t.validate-xhtml10 | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 10 deletions(-) create mode 100755 t.validate-xhtml10 diff --git a/Makefile.am b/Makefile.am index 02f4da76..129d0be3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,7 @@ DEPENDENCIES= libfm.a $(LIBOBJS) check_PROGRAMS= -TESTS= t.smoke t.validate-xhtml t.x509_name_match +TESTS= t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match TESTS_ENVIRONMENT= srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL) if NEED_TRIO diff --git a/t.validate-xhtml b/t.validate-xhtml index 79649481..8eeafcc6 100755 --- a/t.validate-xhtml +++ b/t.validate-xhtml @@ -7,13 +7,6 @@ e=0 fail= IFS=$(printf '\n\t') -# smoke test validator for XHTML 1.0 Transitional, and skip if it fails -cat - <<'_EOF' | xmllint 2>/dev/null --nonet --postvalid --noout - || exit 77 - - - - </head><body></body></html> -_EOF # ditto for XHTML 1.1 (asciidoc generates that) cat - <<'_EOF' | xmllint 2>/dev/null --nonet --postvalid --noout - || exit 77 <?xml version="1.0" encoding="US-ASCII"?> @@ -24,8 +17,8 @@ _EOF for i in "${srcdir}"/*.html ; do case "$i" in - */fetchmail-man.html) continue ;; -# */Mailbox-Names-UTF7.html) continue ;; + */Mailbox-Names-UTF7.html) ;; + *) continue ;; esac xmllint --postvalid --noout "$i" || { e=1 ; fail="$i${fail:+" "}$fail" ; } done diff --git a/t.validate-xhtml10 b/t.validate-xhtml10 new file mode 100755 index 00000000..a7cc9e6b --- /dev/null +++ b/t.validate-xhtml10 @@ -0,0 +1,28 @@ +#! /bin/sh + +# This test script validates all *.html files as XHTML. + +set -eu +e=0 +fail= +IFS=$(printf '\n\t') + +# smoke test validator for XHTML 1.0 Transitional, 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 ;; + */Mailbox-Names-UTF7.html) continue ;; + esac + xmllint --postvalid --noout "$i" || { e=1 ; fail="$i${fail:+" "}$fail" ; } +done +if [ $e != 0 ] ; then + echo >&2 ">>>>> Invalid XHTML in files: ${fail}." +fi +exit $e -- 2.43.2