From 3477ced42b56f6578ddc985299f69cb5ff0d3ab4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 12 Aug 2021 08:14:54 +0200 Subject: [PATCH] tests: be robust to old versions of xlstproc Reported by Christopher Nielsen . * tests/report.at (AT_CHECK_HTML): New. Use it. --- tests/README.md | 1 + tests/report.at | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/README.md b/tests/README.md index a23f6b8b..7039d0ae 100644 --- a/tests/README.md +++ b/tests/README.md @@ -19,6 +19,7 @@ synonyms. - diagnostics - glr - graph +- html: html reports - java - lac - %merge diff --git a/tests/report.at b/tests/report.at index 231c8cb9..77b8af4e 100644 --- a/tests/report.at +++ b/tests/report.at @@ -17,6 +17,19 @@ AT_BANNER([[Test reports.]]) + +# AT_CHECK_HTML(FILE, EXPECTED-CONTENT) +# ------------------------------------- +# Old versions of xsltproc emit 'content="text/html; charset=UTF-8"' +# instead of 'content="text/html;charset=UTF-8"'. +# +m4_define([AT_CHECK_HTML], +[AT_KEYWORDS([html]) +AT_CHECK([sed -e 's|content="text/html; charset=UTF-8"|content="text/html;charset=UTF-8"|g' $1], + [], + [$2])]) + + ## --------- ## ## Reports. ## ## --------- ## @@ -1140,7 +1153,7 @@ AT_CHECK([[cat input.xml]], [], ]]) # Check HTML output. -AT_CHECK([[cat input.html]], [], +AT_CHECK_HTML([input.html], [[ @@ -2651,7 +2664,7 @@ if test x"$XSLTPROC" != x""; then AT_CHECK([[$XSLTPROC \ `]]AT_SET_ENV[[ bison --print-datadir`/xslt/xml2xhtml.xsl \ input.xml >input.html]]) - AT_CHECK([cat input.html], [], + AT_CHECK_HTML([input.html], [[ @@ -3749,7 +3762,7 @@ AT_CHECK([[cat input.xml]], [], ]]) -AT_CHECK([[cat input.html]], [], +AT_CHECK_HTML([input.html], [[ -- 2.11.4.GIT