Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 00:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: be robust to old versions of xlstproc

Browse Source 
Reported by Christopher Nielsen <mascguy@github.com>.
<https://trac.macports.org/raw-attachment/ticket/59927/bison-test-results-20210811-95b72.log.xz>

* tests/report.at (AT_CHECK_HTML): New.
Use it.
This commit is contained in:
Akim Demaille
2021-08-12 08:14:54 +02:00
parent 348b5039fd
commit 3477ced42b
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/README.md
View File

@@ -19,6 +19,7 @@ synonyms.
- diagnostics - diagnostics
- glr - glr
- graph - graph
- html: html reports
- java - java
- lac - lac
- %merge - %merge

19
tests/report.at
View File

@@ -17,6 +17,19 @@
AT_BANNER([[Test reports.]]) 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"'.
# <https://trac.macports.org/raw-attachment/ticket/59927/bison-test-results-20210811-95b72.log.xz>
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. ## ## Reports. ##
## --------- ## ## --------- ##
@@ -1140,7 +1153,7 @@ AT_CHECK([[cat input.xml]], [],
]]) ]])
# Check HTML output. # Check HTML output.
AT_CHECK([[cat input.html]], [], AT_CHECK_HTML([input.html],
[[<?xml version="1.0" encoding="UTF-8"?> [[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="https://www.gnu.org/software/bison/"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="https://www.gnu.org/software/bison/">
@@ -2651,7 +2664,7 @@ if test x"$XSLTPROC" != x""; then
AT_CHECK([[$XSLTPROC \ AT_CHECK([[$XSLTPROC \
`]]AT_SET_ENV[[ bison --print-datadir`/xslt/xml2xhtml.xsl \ `]]AT_SET_ENV[[ bison --print-datadir`/xslt/xml2xhtml.xsl \
input.xml >input.html]]) input.xml >input.html]])
AT_CHECK([cat input.html], [], AT_CHECK_HTML([input.html],
[[<?xml version="1.0" encoding="UTF-8"?> [[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="https://www.gnu.org/software/bison/"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="https://www.gnu.org/software/bison/">
@@ -3749,7 +3762,7 @@ AT_CHECK([[cat input.xml]], [],
]]) ]])
AT_CHECK([[cat input.html]], [], AT_CHECK_HTML([input.html],
[[<?xml version="1.0" encoding="UTF-8"?> [[<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="https://www.gnu.org/software/bison/"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="https://www.gnu.org/software/bison/">