diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-12-24 02:56:35 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-01-11 01:55:03 +0100 |
commit | 6318add07d8f2f8507edcfd85461afea77f68a90 (patch) | |
tree | 40d0e30c985a2cbb85bad6d14238e00c3a0fe50c /tests/txinfo8.test | |
parent | 23934e1f5b4c552065c9499bf61c65455266989c (diff) | |
download | automake-6318add07d8f2f8507edcfd85461afea77f68a90.tar.gz |
Improve, extend and tweak tests on Texinfo support.
* tests/instdir-texi.test: Add a call to `ls -l' after that to
`make', for debugging. When looking for required tools, do not
redirect the output of "$tool --help" to /dev/null, and do not
uselessly run it in a subshell.
* tests/txinfo.test: Rewritten to run autoconf, ./configure and
make. All checks moved into Makefile.am.
* tests/txinfo8.test: Likewise, and modernize the generated
configure.in.
* tests/txinfo2.test: Moved checks into Makefile.am, and other
minor improvements.
* tests/txinfo5.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command.
* tests/txinfo6.test: Likewise, and make grepping of generated
Makefile.in stricter.
* tests/txinfo7.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Do not add unnecessary stuff
to Makefile.am.
* tests/txinfo9.test: Verify that more targets which are expected
to be generated only once really are. Make grepping less strict,
to avoid exposing too much internal details. More minor changes.
* tests/txinfo16.test: Add trailing `:'. Prefer cat over echo
for appending to configure.in. Updated/fixed heading comments.
* tests/txinfo23.test: Likewise, and extended a little by making
it check that no info file is created in the $(srcdir).
* tests/txinfo24.test: Likewise.
* tests/txinfo25.test: Likewise.
* tests/txinfo18.test: Add trailing `:'. Prefer cat over echo
for appending to configure.in. Also, check that index files are
cleaned also by "make clean", not only by "make distclean".
* tests/txinfo22.test: Prefer `$me' over hard-coded test name,
and added trailing `:' command. This testcase also used to check
that automake ignores in-line comments when using variables, but
preserves them in the output; these checks (added in commit
"Release-1-7f-4-g9177ef8") do not really pertain to this test,
so they have been moved ...
* tests/comments-in-var-defn.test: ... into this new test.
* tests/txinfo4.test: Escape literal dots in grep regexps. Add
trailing `:' command.
* tests/txinfo29.test: Likewise. Relax grepping of generated
Makefile.in w.r.t. whitespaces. Prefer `cat' over `echo' to
append to configure.in.
* tests/txinfo3.test: Likewise.
* tests/vtexi.test: Improve grepping of Makefile.in (sometimes
make it stricter, sometimes laxer). Move `set -e' setting just
after the inclusion of ./defs. De-uglify a sed command. Other
minor cosmetic improvements.
* tests/vtexi2.test: Make grepping of Makefile.in stricter. Add
trailing `:' command.
* tests/vtexi3.test: New test on version.texi support.
* tests/vtexi4.test: Likewise.
* tests/Makefile.am (TESTS): Updated.
Diffstat (limited to 'tests/txinfo8.test')
-rwxr-xr-x | tests/txinfo8.test | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/tests/txinfo8.test b/tests/txinfo8.test index 7975b283c..8dd24a4a7 100755 --- a/tests/txinfo8.test +++ b/tests/txinfo8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2011 Free Software # Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -21,32 +21,38 @@ . ./defs || Exit 1 -cat > configure.in << 'END' -AC_INIT -AC_CONFIG_AUX_DIR(sub) -AM_INIT_AUTOMAKE(nonesuch, nonesuch) -AC_OUTPUT(Makefile sub/Makefile) +set -e + +cat > configure.in << END +AC_INIT([$me], [1.0]) +AC_CONFIG_AUX_DIR([auxdir]) +AM_INIT_AUTOMAKE +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT END cat > Makefile.am << 'END' info_TEXINFOS = textutils.texi +.PHONY: test1 test2 +test1: + @echo DISTFILES = $(DISTFILES) + echo ' ' $(DISTFILES) ' ' | grep '[ /]auxdir/texinfo\.tex ' +test2: distdir + ls -l $(distdir)/* + test -f $(distdir)/auxdir/texinfo.tex END echo '@setfilename textutils.info' > textutils.texi -test -d sub || mkdir sub +mkdir auxdir -cat > sub/Makefile.am << 'END' -magic: - @echo $(DISTFILES) -END +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a -$ACLOCAL || Exit 1 -$AUTOMAKE -a || Exit 1 +test -f auxdir/texinfo.tex -$FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed -test -f sub/texinfo.tex && -$MAKE -s -f sub/Makefile.sed SHELL=$SHELL magic | grep 'texinfo\.tex' -stat=$? +./configure +$MAKE test1 test2 -Exit $stat +: |