Check for errors in html files

xmllint doesn't know about the HTML 5 <section> tag so filter
those out.

(cherry picked from commit ea0624b214638cb8b2ac1f1c4ac8ef3fd44bfb32)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02bba70c37359e53e993d4768ef76c951772e3c8..7039e0a188d9364fafc0294dc5ba51a8e2c530f1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -453,7 +453,7 @@ misc:
     - perl -w util/update_copyrights < util/copyrights
     - if test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi
     - xmllint --noout --nonet `git ls-files '*.xml' '*.docbook'`
-    - xmllint --noout --nonet --html `git ls-files '*.html'`
+    - sh util/xmllint-html.sh
     - sh util/check-win32util-configure
     - sh util/check-categories.sh
   needs: []

diff --git a/util/copyrights b/util/copyrights
index 84efb40b03c0a73d3a28ae79d09d8720d8de0145..1bce18687212f7531d1125d8f17e4d1c1bdb18a9 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -4653,6 +4653,7 @@
 ./util/update_branches                         PERL    2005,2007,2012,2016,2018,2019,2020,2021
 ./util/update_copyrights                       PERL    1998,1999,2000,2001,2004,2005,2006,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
 ./util/xc                                      SH      2012,2013,2016,2018,2019,2020,2021
+./util/xmllint-html.sh                         SH      2021
 ./version                                      X       1998,1999,2000,2001,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018,2019,2020,2021
 ./win32utils/Configure                         PERL    2013,2014,2015,2016,2017,2018,2019,2020,2021
 ./win32utils/GeoIP.diff                                X       2013,2018,2019,2020,2021

diff --git a/util/xmllint-html.sh b/util/xmllint-html.sh
new file mode 100644 (file)
index 0000000..4bd6c83
--- /dev/null
+++ b/util/xmllint-html.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -f
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+files=`git ls-files '*.html'`
+if test -n "$files"
+then
+       xmllint --noout --nonet --html $files 2>&1 |
+       awk 'BEGIN { status = 0; }
+            # suppress HTML 5 <section> tag errors
+            /HTML parser error : Tag section invalid/ { getline; getline; next; }
+            { print; status = 1; }
+            END { exit status }'
+fi