diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2018-01-19 16:30:32 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-08 22:44:42 -0500 |
| commit | 79d03908e4bf2565102fa9343b011a1d0dde922a (patch) | |
| tree | 9c7bac4b4915f2c72ff146856cd5094d60521851 | |
| parent | 5b99315ce84e59c5b14ed311226348ed8942de25 (diff) | |
| download | automake-79d03908e4bf2565102fa9343b011a1d0dde922a.tar.gz | |
tests: do not assume AM_MAKEINFOHTMLFLAGS is used in non-html targets
Fixes automake bug https://bugs.gnu.org/30172.
Since AM_MAKEINFOHTMLFLAGS overrides AM_MAKEINFOFLAGS only for html
targets, make sure we restore the hacked up makefile before testing
the non-html formats. This normally doesn't cause a problem for most
people, but if their tex install doesn't work correctly, texi2dvi will
fallback to running $MAKEINFO and using invalid flags in the process.
* THANKS: Add Mathieu Lirzin.
* t/txinfo-many-output-formats.sh: Restore Makefile.am after testing
html targets.
* t/txinfo-many-output-formats-vpath.sh: Likewise.
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | t/txinfo-many-output-formats-vpath.sh | 9 | ||||
| -rw-r--r-- | t/txinfo-many-output-formats.sh | 9 |
3 files changed, 15 insertions, 4 deletions
@@ -269,6 +269,7 @@ Martin Waitz tali@admingilde.org Mathias Doreille doreille@smr.ch Mathias Froehlich M.Froehlich@science-computing.de Mathias Hasselmann mathias.hasselmann@gmx.de +Mathieu Lirzin mthl@gnu.org Matt Burgess matthew@linuxfromscratch.org Matt Leach mleach@cygnus.com Matthew D. Langston langston@SLAC.Stanford.EDU diff --git a/t/txinfo-many-output-formats-vpath.sh b/t/txinfo-many-output-formats-vpath.sh index 98a88428e..3842e63cd 100644 --- a/t/txinfo-many-output-formats-vpath.sh +++ b/t/txinfo-many-output-formats-vpath.sh @@ -155,6 +155,13 @@ test ! -e share/$me/html/main.html test ! -e share/$me/html/main2.html test ! -e share/$me/html/main3.html +# Restore the makefile without a broken AM_MAKEINFOFLAGS definition. +# This must happen before processing any non-html targets. See +# https://bugs.gnu.org/30172 +cp -f $srcdir/Makefile.sav $srcdir/Makefile.am +(cd $srcdir && $AUTOMAKE) +./config.status Makefile + $MAKE dvi test -f main.dvi test -f sub/main2.dvi @@ -198,8 +205,6 @@ test ! -e share/$me/pdf/main2.pdf test ! -e share/$me/pdf/main3.pdf test ! -e share/$me/pdf/hello -# Restore the makefile without a broken AM_MAKEINFOFLAGS definition. -cp -f $srcdir/Makefile.sav $srcdir/Makefile.am using_gmake || $MAKE Makefile $MAKE distcheck diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh index 9903d4ef8..cdb0bf40c 100644 --- a/t/txinfo-many-output-formats.sh +++ b/t/txinfo-many-output-formats.sh @@ -160,6 +160,13 @@ test ! -e share/$me/html/main.html test ! -e share/$me/html/main2.html test ! -e share/$me/html/main3.html +# Restore the makefile without a broken AM_MAKEINFOFLAGS definition. +# This must happen before processing any non-html targets. See +# https://bugs.gnu.org/30172 +cp -f $srcdir/Makefile.sav $srcdir/Makefile.am +(cd $srcdir && $AUTOMAKE) +./config.status Makefile + $MAKE dvi test -f main.dvi test -f sub/main2.dvi @@ -203,8 +210,6 @@ test ! -e share/$me/pdf/main2.pdf test ! -e share/$me/pdf/main3.pdf test ! -e share/$me/pdf/hello -# Restore the makefile without a broken AM_MAKEINFOFLAGS definition. -cp -f $srcdir/Makefile.sav $srcdir/Makefile.am using_gmake || $MAKE Makefile $MAKE distcheck |