diff options
-rw-r--r-- | ChangeLog | 21 | ||||
-rw-r--r-- | HACKING | 7 | ||||
-rw-r--r-- | doc/automake.texi | 54 | ||||
-rw-r--r-- | tests/Makefile.am | 5 | ||||
-rw-r--r-- | tests/Makefile.in | 5 | ||||
-rw-r--r-- | tests/README | 7 | ||||
-rwxr-xr-x | tests/amhello-binpkg.test | 43 | ||||
-rwxr-xr-x | tests/amhello-cflags.test | 50 | ||||
-rwxr-xr-x | tests/amhello-cross-compile.test | 54 | ||||
-rwxr-xr-x | tests/interp.test | 10 | ||||
-rwxr-xr-x | tests/parallel-tests-log-compiler-example.test | 71 | ||||
-rwxr-xr-x | tests/specflg8.test | 33 | ||||
-rwxr-xr-x | tests/tests-environment-backcompat.test | 65 | ||||
-rwxr-xr-x | tests/txinfo21.test | 4 |
14 files changed, 393 insertions, 36 deletions
@@ -1,3 +1,24 @@ +2011-07-01 Stefano Lattarini <stefano.lattarini@gmail.com> + + docs, tests: synchronize examples from docs to tests + * tests/README (Writing test cases): Give suggestions on how to + keep test cases and examples in the documentation synchronized. + * doc/automake.texi: Improve or fix existing testcase-referencing + comments, and add many new ones. + * HACKING (Administrivia): Suggest to test complex examples and + idioms from the manual. + * tests/specflg8.test: Improve synchronization with the example + in the manual. + * tests/output11.test:Likewise. + * tests/txinfo21.test:Likewise. + * tests/interp.test: Likewise. + * tests/amhello-cflags.test: New test. + * tests/amhello-cross-compile.test: Likewise. + * tests/amhello-binpkg.test: Likewise. + * tests/tests-environment-backcompat: Likewise. + * tests/parallel-tests-log-compiler-example.test: Likewise. + * tests/Makefile.am (TESTS): Update. + 2011-06-30 Stefano Lattarini <stefano.lattarini@gmail.com> coverage: new test on parallel-tests TESTS runtime overriding @@ -20,6 +20,10 @@ * If somebody reports a new bug, mention his name in the ChangeLog entry and in the test case you write. Put him into THANKS. +* When documenting a non-trivial idiom or example in the manual, be + sure to add a test case for it, and to reference such test case from + a proper Texinfo comment. + * The correct response to most actual bugs is to write a new test case which demonstrates the bug. Then fix the bug, re-run the test suite, and check everything in. @@ -243,7 +247,8 @@ ----- -Copyright (C) 2003, 2007, 2008, 2010 Free Software Foundation, Inc. +Copyright (C) 2003, 2007, 2008, 2010, 2011 Free Software Foundation, +Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/doc/automake.texi b/doc/automake.texi index 72f0eb365..4d89a4361 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -909,6 +909,7 @@ GNU Make Manual}). VPATH builds have other interesting uses. One is to build the same sources with multiple configurations. For instance: +@c Keep in sync with amhello-cflags.test. @example ~ % @kbd{tar zxf ~/amhello-1.0.tar.gz} ~ % @kbd{cd amhello-1.0} @@ -1060,6 +1061,7 @@ instance my cross-compiler for MinGW32 has its binaries called Here is how we could build @code{amhello-1.0} for @code{i586-mingw32msvc} on a GNU/Linux PC. +@c Keep in sync with amhello-cross-compile.test. @smallexample ~/amhello-1.0 % @kbd{./configure --build i686-pc-linux-gnu --host i586-mingw32msvc} checking for a BSD-compatible install... /usr/bin/install -c @@ -1174,6 +1176,7 @@ by some means. For instance here is how we could create a binary package containing a snapshot of all the files to be installed. +@c Keep in sync with amhello-binpkg.test. @example ~/amhello-1.0 % @kbd{./configure --prefix /usr} @dots{} @@ -1853,6 +1856,7 @@ When examining a variable definition, Automake will recursively examine variables referenced in the definition. For example, if Automake is looking at the content of @code{foo_SOURCES} in this snippet +@c Keep in sync with interp.test. @example xs = a.c b.c foo_SOURCES = c.c $(xs) @@ -2033,6 +2037,7 @@ defined (e.g., @samp{zardir}). For instance, the following snippet will install @file{file.xml} into @samp{$(datadir)/xml}. +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example xmldir = $(datadir)/xml xml_DATA = file.xml @@ -2043,6 +2048,7 @@ performs to diagnose suspicious directory/primary couples (in the unlikely case these checks are undesirable, and you really know what you're doing). For example, Automake would error out on this input: +@c Should be tested in primary-prefix-invalid-couples.test. @example # Forbidden directory combinations, automake will error out on this. pkglib_PROGRAMS = foo @@ -2052,6 +2058,7 @@ doc_LIBRARIES = libquux.a @noindent but it will succeed with this: +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example # Work around forbidden directory combinations. Do not use this # without a very good reason! @@ -2132,6 +2139,7 @@ data_DATA = file1 @dots{} file@var{N} file@var{N+1} @dots{} file@var{2N} @noindent may also be written as +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example data_DATA = file1 @dots{} file@var{N} data2dir = $(datadir) @@ -2470,6 +2478,7 @@ example in the manual. However if you were to build @code{true} and @code{false} in real life, you would probably use per-program compilation flags, like so: +@c Keep in sync with specflg7.test and specflg8.test. @example bin_PROGRAMS = false true @@ -2793,6 +2802,7 @@ literals. If part of the specification uses shell variables, @command{automake} will not be able to fulfill this setup, and you will have to complete the missing bits by hand. For instance, on +@c Keep in sync with output11.test. @example file=input @dots{} @@ -2808,6 +2818,7 @@ source file.) Similarly +@c Keep in sync with output11.test. @example file=output file2=out:in @@ -3435,6 +3446,7 @@ installs this macro so that @command{aclocal} will find it. A macro file's name should end in @file{.m4}. Such files should be installed in @file{$(datadir)/aclocal}. This is as simple as writing: +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example aclocaldir = $(datadir)/aclocal aclocal_DATA = mymacro.m4 myothermacro.m4 @@ -4275,9 +4287,7 @@ does not know the possible values of these variables. In this case @cindex @code{SUBDIRS} and @code{AM_CONDITIONAL} @cindex @code{AM_CONDITIONAL} and @code{SUBDIRS} -@c The test case for the setup described here is -@c test/subdircond2.test -@c Try to keep it in sync. +@c Keep in sync with subcond2.test. @file{configure} should output the @file{Makefile} for each directory and define a condition into which @file{opt/} should be built. @@ -4317,9 +4327,7 @@ automatically because it knows that @code{MAYBE_OPT} can contain @cindex @code{SUBDIRS} and @code{AC_SUBST} @cindex @code{AC_SUBST} and @code{SUBDIRS} -@c The test case for the setup described here is -@c test/subdircond3.test -@c Try to keep it in sync. +@c Keep in sync with subcond3.test. Another possibility is to define @code{MAYBE_OPT} from @file{./configure} using @code{AC_SUBST}: @@ -4477,6 +4485,7 @@ often be replaced by several variables, one for each destination directory (@pxref{Uniform}). For instance, the last example could be rewritten as follows: +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example imagesdir = $(pkgdatadir)/images soundsdir = $(pkgdatadir)/sounds @@ -4932,6 +4941,7 @@ You can also use Automake conditionals (@pxref{Conditionals}) to select programs to be built. In this case you don't have to worry about @samp{$(EXEEXT)} or @code{EXTRA_PROGRAMS}. +@c Keep in sync with exeext.test. @example bin_PROGRAMS = cpio pax if WANT_MT @@ -4982,6 +4992,7 @@ Extra objects can be added to a library using the @code{@var{library}_LIBADD} variable. This should be used for objects determined by @command{configure}. Again from @code{cpio}: +@c Keep in sync with pr401c.test. @example libcpio_a_LIBADD = $(LIBOBJS) $(ALLOCA) @end example @@ -5185,6 +5196,7 @@ relates to @file{libfoo.la} or @file{libbar.la} at the time it creates the link rule for these two libraries. Therefore the @option{-rpath} argument must be explicitly supplied. +@c Keep in sync with ltcond.test. @example EXTRA_LTLIBRARIES = libfoo.la libbar.la lib_LTLIBRARIES = $(WANTEDLIBS) @@ -5200,6 +5212,7 @@ Automake is able to compute the @option{-rpath} setting itself, because it's clear that both libraries will end up in @samp{$(libdir)} if they are installed. +@c Keep in sync with ltcond.test. @example lib_LTLIBRARIES = if WANT_LIBFOO @@ -5226,6 +5239,7 @@ we could build a @file{libhello.la} library using either @file{hello-linux.c} or @file{hello-generic.c} with the following @file{Makefile.am}. +@c Keep in sync with ltcond2.test. @example lib_LTLIBRARIES = libhello.la libhello_la_SOURCES = hello-common.c @@ -5240,6 +5254,7 @@ either @file{hello-linux.lo} or @file{hello-@-generic.lo}. Or we could simply use an Automake conditional as follows. +@c Keep in sync with ltcond2.test. @example lib_LTLIBRARIES = libhello.la libhello_la_SOURCES = hello-common.c @@ -5279,6 +5294,7 @@ dependency anywhere it won't be built (this is why Here is a sample setup merging libtool convenience libraries from subdirectories into one main @file{libtop.la} library. +@c Keep in sync with ltconv.test. @example # -- Top-level Makefile.am -- SUBDIRS = sub1 sub2 @dots{} @@ -7503,6 +7519,7 @@ variable explicitly prevents byte-compilation. Since Automake 1.8, we now recommend using @code{lisp_DATA} instead: +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example lisp_DATA = file1.el file2.el @end example @@ -7556,6 +7573,7 @@ files are not included in the distribution, you should use the Here is a typical setup for distributing @file{.java} files and installing the @file{.class} files resulting from their compilation. +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example javadir = $(datadir)/java dist_java_JAVA = a.java b.java @dots{} @@ -7629,6 +7647,7 @@ Automake ships with an Autoconf macro called @code{AM_PATH_PYTHON} that will determine some Python-related directory variables (see below). If you have called @code{AM_PATH_PYTHON} from @file{configure.ac}, then you may use the variables +@c Keep in sync with primary-prefix-couples-documented-valid.test. @code{python_PYTHON} or @code{pkgpython_PYTHON} to list Python source files in your @file{Makefile.am}, depending on where you want your files installed (see the definitions of @code{pythondir} and @@ -7717,6 +7736,7 @@ This is the directory where Python extension modules (shared libraries) should be installed. An extension module written in C could be declared as follows to Automake: +@c Keep in sync with primary-prefix-couples-documented-valid.test. @example pyexec_LTLIBRARIES = quaternion.la quaternion_la_SOURCES = quaternion.c support.c support.h @@ -7913,6 +7933,7 @@ passed to @code{makeinfo} when building @file{.info} files; and @samp{$(AM_MAKEINFOHTMLFLAGS)} is used when building @file{.html} files. +@c Keep in sync with txinfo21.test. For instance, the following setting can be used to obtain one single @file{.html} file per manual, without node separators. @example @@ -8138,10 +8159,11 @@ Variables using the standard directory prefixes @samp{bin}, For instance, @code{data_DATA} files are installed by @code{install-data}, while @code{bin_PROGRAMS} files are installed by @code{install-exec}. -Any variable using a user-defined directory prefix with @samp{exec} in -the name (e.g., @code{myexecbin_PROGRAMS}) is installed by -@code{install-exec}. All other user-defined prefixes are installed by -@code{install-data}. +Any variable using a user-defined directory prefix with +@samp{exec} in the name (e.g., +@c Keep in sync with primary-prefix-couples-documented-valid.test. +@code{myexecbin_PROGRAMS}) is installed by @code{install-exec}. All +other user-defined prefixes are installed by @code{install-data}. @node Extending Installation @section Extending Installation @@ -8326,7 +8348,7 @@ included if they are found in the current directory (either physically, or as the target of a @file{Makefile.am} rule); this list is printed by @samp{automake --help}. Note that some files in this list are actually distributed only if other certain conditions hold (for example, -@c The following example is covered by autodist-config-headers.test. +@c Keep in sync with autodist-config-headers.test. the @file{config.h.top} and @file{config.h.bot} files are automatically distributed only if, e.g., @samp{AC_CONFIG_HEADERS([config.h])} is used in @file{configure.ac}). Also, files that are read by @command{configure} @@ -8516,6 +8538,7 @@ If you want @code{distcleancheck} to ignore built files that have not been cleaned because they are also part of the distribution, add the following definition instead: +@c Keep in sync with distcleancheck.test. @example distcleancheck_listfiles = \ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \ @@ -8678,6 +8701,7 @@ set @code{TESTS_ENVIRONMENT} to an invocation of the shell (e.g. interpreter. For instance, the following setup may be used to run tests with Perl: +@c Keep in sync with tests-environment-backcompat.test. @example TESTS_ENVIRONMENT = $(PERL) -Mstrict -w TESTS = foo.pl bar.pl baz.pl @@ -8785,6 +8809,7 @@ this extension to be called with this driver. For all tests without a registered extension, the variables @code{LOG_COMPILER}, @code{AM_LOG_FLAGS}, and @code{LOG_FLAGS} may be used. For example, +@c Keep in sync with parallel-tests-log-compiler-example.test. @example TESTS = foo.pl bar.py baz TEST_EXTENSIONS = .pl .py @@ -8871,6 +8896,7 @@ whose testsuite takes long time to execute. Luckily, this problem can easily be avoided by overriding also @code{TEST_SUITE_LOG} at runtime; for example, +@c Keep in sync with parallel-tests-log-override-2.test. @example env TEST_SUITE_LOG=partial.log TESTS="..." make -e check @end example @@ -9633,6 +9659,7 @@ For instance, the following definition prevents Automake from misinterpreting the @samp{.idlC.cpp:} rule as an attempt to transform @file{.idlC} files into @file{.cpp} files. +@c Keep in sync with suffix7.test. @example SUFFIXES = .idl C.cpp .idlC.cpp: @@ -10461,6 +10488,7 @@ Checks, autoconf, The Autoconf Manual}) and use @samp{$(LN_S)} in For instance, here is how you could install a versioned copy of a program using @samp{$(LN_S)}: +@c Keep in sync with insthook.test @example install-exec-hook: cd $(DESTDIR)$(bindir) && \ @@ -10475,7 +10503,9 @@ destination directory in order to create relative links. When writing @code{install-exec-hook} or @code{install-data-hook}, please bear in mind that the exec/data distinction is based on the installation directory, not on the primary used (@pxref{The Two Parts of -Install}). So a @code{foo_SCRIPTS} will be installed by +Install}). +@c Keep in sync with primary-prefix-couples-documented-valid.test. +So a @code{foo_SCRIPTS} will be installed by @code{install-data}, and a @code{barexec_SCRIPTS} will be installed by @code{install-exec}. You should define your hooks consequently. diff --git a/tests/Makefile.am b/tests/Makefile.am index 0409258f3..fd50754fe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -145,6 +145,9 @@ alloca.test \ alloca2.test \ alpha.test \ alpha2.test \ +amhello-cflags.test \ +amhello-cross-compile.test \ +amhello-binpkg.test \ amassign.test \ ammissing.test \ amopt.test \ @@ -236,6 +239,7 @@ check12.test \ check-exported-srcdir.test \ check-tests-in-builddir.test \ check-tests_environment.test \ +tests-environment-backcompat.test \ checkall.test \ clean.test \ clean2.test \ @@ -728,6 +732,7 @@ parallel-tests-log-override-1.test \ parallel-tests-log-override-2.test \ parallel-tests-log-override-recheck.test \ parallel-tests-cmdline-override.test \ +parallel-tests-log-compiler-example.test \ parse.test \ percent.test \ percent2.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index c5018197c..306189da5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -418,6 +418,9 @@ alloca.test \ alloca2.test \ alpha.test \ alpha2.test \ +amhello-cflags.test \ +amhello-cross-compile.test \ +amhello-binpkg.test \ amassign.test \ ammissing.test \ amopt.test \ @@ -509,6 +512,7 @@ check12.test \ check-exported-srcdir.test \ check-tests-in-builddir.test \ check-tests_environment.test \ +tests-environment-backcompat.test \ checkall.test \ clean.test \ clean2.test \ @@ -1001,6 +1005,7 @@ parallel-tests-log-override-1.test \ parallel-tests-log-override-2.test \ parallel-tests-log-override-recheck.test \ parallel-tests-cmdline-override.test \ +parallel-tests-log-compiler-example.test \ parse.test \ percent.test \ percent2.test \ diff --git a/tests/README b/tests/README index 3c33c87eb..b38591556 100644 --- a/tests/README +++ b/tests/README @@ -113,6 +113,13 @@ Do Cite the PR number (if any), and the original reporter (if any), so we can find or ask for information if needed. + If a test checks examples or idioms given in the documentation, make + sure the documentation reference them appropriately in comments, as in: + @c Keep in sync with autodist-config-headers.test. + @example + ... + @end example + Use `required=...' for required tools. Do not explicitly require tools which can be taken for granted because they're listed in the GNU Coding Standards (for example, `gzip'). diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test new file mode 100755 index 000000000..8085a232f --- /dev/null +++ b/tests/amhello-binpkg.test @@ -0,0 +1,43 @@ +#! /bin/sh +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Test an example from the manual about the `amhello' package: +# using DESTDIR to build simple, no-frills binary packages. + +. ./defs || Exit 1 + +set -e + +cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \ + || fatal_ "cannot get amhello tarball" + +tar zxf amhello-1.0.tar.gz +cd amhello-1.0 + +./configure --prefix /usr +make +make DESTDIR="`pwd`/inst" install +cd inst +find . -type f -print > ../files.lst +tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > t +LC_ALL=C sort t > tar.got + +diff - tar.got <<'END' +./usr/bin/hello +./usr/share/doc/amhello/README +END + +: diff --git a/tests/amhello-cflags.test b/tests/amhello-cflags.test new file mode 100755 index 000000000..1c3e5160e --- /dev/null +++ b/tests/amhello-cflags.test @@ -0,0 +1,50 @@ +#! /bin/sh +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Test an example from the manual about the `amhello' package: +# using VPATH builds to configure the same package with different +# options. + +required=gcc +. ./defs || Exit 1 + +set -e + +cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \ + || fatal_ "cannot get amhello tarball" + +tar zxf amhello-1.0.tar.gz +cd amhello-1.0 +mkdir debug optim +cd debug +../configure CFLAGS='-g -O0' +$MAKE +ls -l . src # For debugging. +cd ../optim +../configure CFLAGS='-O3 -fomit-frame-pointer' +$MAKE +ls -l . src # For debugging. +cd .. + +# Check that we have really compiled the objects with two different +# configurations. +for exeext in '' .exe :; do + test -f optim/src/hello$exeext && break + test "$exeext" = : && fatal_ "cannot determine extension of executables" +done +cmp optim/src/hello$exeext debug/src/hello$exeext && Exit 1 + +: diff --git a/tests/amhello-cross-compile.test b/tests/amhello-cross-compile.test new file mode 100755 index 000000000..862a0793d --- /dev/null +++ b/tests/amhello-cross-compile.test @@ -0,0 +1,54 @@ +#! /bin/sh +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Test an example from the manual about the `amhello' package: +# cross-compiling a package from Linux/Unix to MinGW. + +required=i586-mingw32msvc-gcc +. ./defs || Exit 1 + +set -e + +cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \ + || fatal_ "cannot get amhello tarball" + +host=i586-mingw32msvc +build=`"$testsrcdir"/../lib/config.guess` && test -n "$build" \ + || fatal_ "cannot guess build platform" +case $build in *mingw*) skip_ "build system is MinGW too";; esac + +tar zxf amhello-1.0.tar.gz +cd amhello-1.0 + +./configure --build "$build" --host "$host" > stdout \ + || { cat stdout ; Exit 1; } +cat stdout +grep '^checking for i586-mingw32msvc-strip\.\.\.' stdout +grep '^checking for i586-mingw32msvc-gcc\.\.\.' stdout +grep '^checking for suffix of executables\.\.\. \.exe *$' stdout +grep '^checking for suffix of object files\.\.\. o *$' stdout +grep '^checking whether i586-mingw32msvc-gcc accepts -g\.\.\. yes' stdout + +$MAKE + +cd src +file hello.exe > whatis +cat whatis +$EGREP 'DOS|Win' whatis +grep 'executable' whatis +grep 'ELF' whatis && Exit 1 + +: diff --git a/tests/interp.test b/tests/interp.test index e4352d7d2..911dc65fe 100755 --- a/tests/interp.test +++ b/tests/interp.test @@ -24,14 +24,16 @@ AC_PROG_CC END cat > Makefile.am << 'END' -bin_PROGRAMS = qqq -s1 = z.c -qqq_SOURCES = $(s1) +bin_PROGRAMS = foo +xs = a.c b.c +foo_SOURCES = c.c $(xs) END $ACLOCAL $AUTOMAKE -$FGREP 'z.$(OBJEXT)' Makefile.in +$FGREP ' a.$(OBJEXT)' Makefile.in +$FGREP ' b.$(OBJEXT)' Makefile.in +$FGREP ' c.$(OBJEXT)' Makefile.in : diff --git a/tests/parallel-tests-log-compiler-example.test b/tests/parallel-tests-log-compiler-example.test new file mode 100755 index 000000000..746c128d7 --- /dev/null +++ b/tests/parallel-tests-log-compiler-example.test @@ -0,0 +1,71 @@ +#! /bin/sh +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Test the example of usage of generic and extension-specific +# LOG_COMPILER and LOG_FLAGS given in the manual. + +parallel_tests=yes +required=python +. ./defs || Exit 1 + +set -e + +cat >> configure.in <<END +AC_SUBST([PERL], ['$PERL']) +AM_PATH_PYTHON +AC_OUTPUT +END + +cat > Makefile.am << 'END' +TESTS = foo.pl bar.py baz +TEST_EXTENSIONS = .pl .py +PL_LOG_COMPILER = $(PERL) +AM_PL_LOG_FLAGS = -w +PY_LOG_COMPILER = $(PYTHON) +AM_PY_LOG_FLAGS = -v +LOG_COMPILER = ./wrapper-script +AM_LOG_FLAGS = -d +END + +echo 'my $a =+ 2; exit (0);' > foo.pl +echo 'import sys; sys.exit(0);' > bar.py +: > baz + +cat > wrapper-script <<'END' +#!/bin/sh +echo "wrapper args: $*" +END +chmod a+x wrapper-script + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure + +st=0 +$MAKE check || st=$? +cat foo.log +cat bar.log +cat baz.log +test $st -eq 0 || Exit $st + +# Check that the wrappers have been run with the expected flags. +grep '[rR]eversed.*+=.*operator.*foo\.pl' foo.log +grep '^# *[cC]lear.*sys\.argv' bar.log +grep '^wrapper args:.* -d .*baz' baz.log + +: diff --git a/tests/specflg8.test b/tests/specflg8.test index 1defd0bef..d2c6714fb 100755 --- a/tests/specflg8.test +++ b/tests/specflg8.test @@ -32,25 +32,18 @@ END # different flags. cat > Makefile.am << 'END' -FALSESOURCE = false.c +TRUESOURCE = true.c bin_PROGRAMS = false true -true_SOURCES = $(FALSESOURCE) -true_CPPFLAGS = -DAM_TRUE -false_SOURCES = $(FALSESOURCE) -false_CPPFLAGS = -DAM_FALSE +true_SOURCES = $(TRUESOURCE) +true_CPPFLAGS = -DEXIT_CODE=0 +false_SOURCES = $(TRUESOURCE) +false_CPPFLAGS = -DEXIT_CODE=1 END -cat > false.c << 'END' -#include <stdio.h> -int -main (int argc, char *argv[]) +cat > true.c << 'END' +int main (void) { -#ifdef AM_TRUE - puts ("true"); -#else - puts ("false"); -#endif - return 0; + return EXIT_CODE; } END @@ -60,5 +53,11 @@ $AUTOMAKE -a ./configure $MAKE -./true | grep true -./false | grep false + +./true +./false && Exit 1 + +test -f ./true-true.o +test -f ./true-true.o + +: diff --git a/tests/tests-environment-backcompat.test b/tests/tests-environment-backcompat.test new file mode 100755 index 000000000..6749bc2f2 --- /dev/null +++ b/tests/tests-environment-backcompat.test @@ -0,0 +1,65 @@ +#! /bin/sh +# Copyright (C) 2011 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# With old serial testsuite driver, TESTS_ENVIRONMENT can be used to +# define the "test runner", i.e. the program that the test scripts must +# be run by (with the parallel-tests driver one should use LOG_COMPILER +# for this). The behaviour tested here is also documented in the manual. + +parallel_tests=no +. ./defs || Exit 1 + +set -e + +cat >> configure.in <<END +AC_SUBST([PERL], ['$PERL']) +AC_OUTPUT +END + +cat > Makefile.am << 'END' +TESTS_ENVIRONMENT = $(PERL) -Mstrict -w +TESTS = foo.pl bar.pl baz.pl +XFAIL_TESTS = baz.pl +EXTRA_DIST = $(TESTS) +END + +echo 'exit (0);' > foo.pl +echo 'exit (0);' > bar.pl + +cat > baz.pl << 'END' +# With "use strict" enacted, this will cause an error, since the +# variable `$x' is not declared with `my' nor specified with an +# explicit package name. +$x = 0; +exit ($x); +END + +cat > baz.pl << 'END' +exit (1); +END + +chmod a+x *.pl + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure + +$MAKE check +$MAKE distcheck + +: diff --git a/tests/txinfo21.test b/tests/txinfo21.test index eea48904f..20bcd0087 100755 --- a/tests/txinfo21.test +++ b/tests/txinfo21.test @@ -117,8 +117,8 @@ test ! -f rec/main3.html # Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO. cat >>Makefile.am <<\EOF -AM_MAKEINFOHTMLFLAGS=--no-split -AM_MAKEINFOFLAGS=--unsupported-option +AM_MAKEINFOHTMLFLAGS = --no-headers --no-split +AM_MAKEINFOFLAGS = --unsupported-option EOF $AUTOMAKE ./configure --prefix "`pwd`" |