diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 9 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 33 | ||||
| -rwxr-xr-x | tests/canon2.test | 4 | ||||
| -rwxr-xr-x | tests/info.test | 2 | ||||
| -rwxr-xr-x | tests/mdate.test | 1 | ||||
| -rwxr-xr-x | tests/mdate2.test | 1 | ||||
| -rwxr-xr-x | tests/texinfo.test | 2 | ||||
| -rwxr-xr-x | tests/texinfo2.test | 2 | ||||
| -rwxr-xr-x | tests/texinfo3.test | 16 | ||||
| -rwxr-xr-x | tests/texinfo4.test | 15 | ||||
| -rwxr-xr-x | tests/vtexi.test | 1 | ||||
| -rwxr-xr-x | tests/vtexi2.test | 1 |
13 files changed, 65 insertions, 24 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 8943febc9..04282c5ed 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,12 @@ +Sun Feb 23 11:58:00 1997 Tom Tromey <tromey@cygnus.com> + + * texinfo.test, texinfo2.test, texinfo3.test, info.test, + mdate.test, vtexi.test, canon2.test, mdate2.test, vtexi2.test: + Updated for new texinfo handling. + + * texinfo4.test: New file. + * texinfo3.test: New file. + Sat Feb 22 09:48:44 1997 Tom Tromey <tromey@cygnus.com> * yaccpp.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index 0919302ec..80b93dce5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,7 +23,7 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \ colon2.test colon3.test remake.test output.test output2.test \ remake2.test output3.test output4.test colneq2.test subst.test \ -defun2.test yaccpp.test +defun2.test yaccpp.test texinfo3.test texinfo4.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 616f56623..daec4ce5a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1l from Makefile.am +# Makefile.in generated automatically by automake 1.1g from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,11 +37,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ -VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnits @@ -66,7 +63,7 @@ distdir.test lex2.test libobj4.test libobj5.test version.test \ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \ colon2.test colon3.test remake.test output.test output2.test \ remake2.test output3.test output4.test colneq2.test subst.test \ -defun2.test yaccpp.test +defun2.test yaccpp.test texinfo3.test texinfo4.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -74,20 +71,20 @@ CONFIG_CLEAN_FILES = DIST_COMMON = ChangeLog Makefile.am Makefile.in +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ $(TEXINFOS) $(MANS) $(EXTRA_DIST) - -GZIP = --best default: all -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) - cd $(top_srcdir) && automake --gnits tests/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in + cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile + +Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - tags: TAGS TAGS: @@ -125,8 +122,7 @@ check-TESTS: $(TESTS) fi info: dvi: -check: all - $(MAKE) check-TESTS +check: all check-TESTS installcheck: install-exec: $(NORMAL_INSTALL) @@ -162,16 +158,16 @@ maintainer-clean-generic: test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic -clean: clean-generic mostlyclean +clean: clean-generic mostlyclean -distclean: distclean-generic clean distclean-local +distclean: distclean-generic clean rm -f config.status -maintainer-clean: maintainer-clean-generic distclean +maintainer-clean: maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: default tags distdir check-TESTS info dvi installcheck \ +.PHONY: default tags distdir check-TESTS info dvi check installcheck \ install-exec install-data install uninstall all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean @@ -179,6 +175,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean distclean-local: rm -rf testSubdir +.SUFFIXES: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tests/canon2.test b/tests/canon2.test index 83b49e9ef..0efe34608 100755 --- a/tests/canon2.test +++ b/tests/canon2.test @@ -10,8 +10,8 @@ zar_doz_TEXINFOS = frob.texi END : > texinfo.tex -: > zar-doz.texi -: > frob.texi +echo '@setfilename zar-doz.info' > zar-doz.texi +echo '@setfilename frob' > frob.texi $AUTOMAKE || exit 1 diff --git a/tests/info.test b/tests/info.test index 327999d22..f5c3cfa5b 100755 --- a/tests/info.test +++ b/tests/info.test @@ -11,7 +11,7 @@ magic: @echo $(INFOS) END -: > foo.texi +echo '@setfilename foo.info' > foo.texi : > texinfo.tex $AUTOMAKE || exit 1 diff --git a/tests/mdate.test b/tests/mdate.test index b9b5f74f9..c0619e893 100755 --- a/tests/mdate.test +++ b/tests/mdate.test @@ -10,6 +10,7 @@ END cat > textutils.texi << 'END' @include version.texi +@setfilename textutils.info END # Required when using Texinfo. diff --git a/tests/mdate2.test b/tests/mdate2.test index c27d8a88c..ef1945832 100755 --- a/tests/mdate2.test +++ b/tests/mdate2.test @@ -15,6 +15,7 @@ END # Required when using Texinfo. : > texinfo.tex : > mdate-sh +echo '@setfilename textutils' > textutils.texi # Use "././" to confuse Automake into thinking this is a subdir build. $AUTOMAKE ././Makefile || exit 1 diff --git a/tests/texinfo.test b/tests/texinfo.test index 19e5f0ff3..609726509 100755 --- a/tests/texinfo.test +++ b/tests/texinfo.test @@ -11,7 +11,7 @@ magic: @echo $(DISTFILES) END -: > textutils.texi +echo '@setfilename textutils.info' > textutils.texi : > texinfo.tex $AUTOMAKE || exit 1 diff --git a/tests/texinfo2.test b/tests/texinfo2.test index 6ca27fe7a..74e32818c 100755 --- a/tests/texinfo2.test +++ b/tests/texinfo2.test @@ -12,7 +12,7 @@ magic: END : > texinfo.tex -: > textutils.texi +echo '@setfilename textutils.info' > textutils.texi : > textutils.info~ $AUTOMAKE || exit 1 diff --git a/tests/texinfo3.test b/tests/texinfo3.test new file mode 100755 index 000000000..e5ae26954 --- /dev/null +++ b/tests/texinfo3.test @@ -0,0 +1,16 @@ +#! /bin/sh + +# Test to make sure .info-less @setfilename works. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +info_TEXINFOS = textutils.texi +END + +echo '@setfilename textutils' > textutils.texi +: > texinfo.tex + +$AUTOMAKE || exit 1 + +grep '^INFO_DEPS.*textutils$' Makefile.in diff --git a/tests/texinfo4.test b/tests/texinfo4.test new file mode 100755 index 000000000..17b76e570 --- /dev/null +++ b/tests/texinfo4.test @@ -0,0 +1,15 @@ +#! /bin/sh + +# Make sure non-empty, non-info suffixes are diagnosed. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +info_TEXINFOS = textutils.texi +END + +echo '@setfilename textutils.frob' > textutils.texi +: > texinfo.tex + +$AUTOMAKE && exit 1 +exit 0 diff --git a/tests/vtexi.test b/tests/vtexi.test index eac76e9c2..09524eb58 100755 --- a/tests/vtexi.test +++ b/tests/vtexi.test @@ -15,6 +15,7 @@ END cat > textutils.texi << 'END' @include version.texi +@setfilename textutils.info END # Required when using Texinfo. diff --git a/tests/vtexi2.test b/tests/vtexi2.test index f59e9f8f1..d950c258c 100755 --- a/tests/vtexi2.test +++ b/tests/vtexi2.test @@ -12,6 +12,7 @@ info_TEXINFOS = zardoz.texi END cat > zardoz.texi << 'END' +@setfilename zardoz @include version.texi END |