Peter Rosin [Wed, 7 Mar 2012 20:08:08 +0000 (21:08 +0100)]
Merge branch 'maint'
Peter Rosin [Wed, 7 Mar 2012 20:08:06 +0000 (21:08 +0100)]
Merge branch 'msvc' into maint
This merge remedies the confusing situation that some changes
destined for both the master branch and the release branch (a.k.a.
branch-1.11) currently needs to be made on the non-obvious msvc
branch and not on the more natural maint branch. This has caused
a seemingly endless string of less than optimal commits.
The reason for the confusion stems from the fact that the changes made
on the msvc branch became too radical and was considered only suitable
for the master branch, and was thus written in a form suitable for
master and then merged there. Later, the msvc branch was merged
directly into branch-1.11, in order to rush the new features to the
market and to keep the released scripts (lib/ar-lib, lib/compile and
lib/depcomp) consistent with those on the master branch. However,
some changes had to be made to the features added by the msvc branch
in order for them to fit the requirements of branch-1.11, notably that
the warnings issued in the extra-portability class cannot be enabled
by -Wall in the 1.11.x maintenance releases.
In retrospect, it would have been better to not merge msvc directly
into branch-1.11, but instead do it via the maint branch (followed up
with a dummy merge from maint into master) the moment it was decided
that the msvc changes should make it into branch-1.11.
All in all, this merge is going to affect neither the master branch
nor branch-1.11, since it is followed up with dummy merges masking all
changes. The merge is made to maintain the sanity of the poor
developers, who wishes to once again have a working maint branch.
Discussion about merging the msvc branch into branch-1.11:
http://lists.gnu.org/archive/html/automake/2011-10/msg00030.html
Discussion about why this merge hasn't happened before:
http://lists.gnu.org/archive/html/automake/2011-12/msg00051.html
Extra edits below.
* lib/Automake/ChannelDefs.pm: Use the version from branch-1.11.
* tests/ar-lib3.test: Likewise.
* tests/ar-lib4.test: Likewise.
* tests/extra-portability.test: Likewise.
* tests/extra-portability2.test: Likewise.
* tests/extradep.test: Likewise.
* tests/extradep2.test: Likewise.
* tests/list-of-tests.mk: Likewise.
* HACKING: Backport the version from branch-1.11 while at it (as the
change on branch-1.11 is also present on master via an unrelated
commit), even though this change has nothing to do with the changes
on the msvc branch.
Stefano Lattarini [Wed, 7 Mar 2012 07:59:59 +0000 (08:59 +0100)]
tests: remove useless sleep from tests on remake rules
The sleeps were there to make generated autotools files strictly
newer than their sources; however, this is not necessary, since
POSIX mandates that make considers files with the same timestamp
of their dependencies to be up-to-date.
* tests/remake9a.test: Remove useless $sleep.
* tests/remake9b.test: Likewise.
* tests/remake9c.test: Likewise.
* tests/remake9d.test: Likewise.
* tests/remake10a.test: Likewise.
* tests/remake10b.test: Likewise.
* tests/remake10c.test: Likewise.
Stefano Lattarini [Wed, 7 Mar 2012 07:23:45 +0000 (08:23 +0100)]
Merge branch 'msvc' into master (dummy merge)
Stefano Lattarini [Wed, 7 Mar 2012 07:20:26 +0000 (08:20 +0100)]
Merge branch 'maint' into msvc
* maint:
news: describe recently-fixed bug in vala support
depcomp: add support for IBM xlc/xlC compilers
Stefano Lattarini [Tue, 6 Mar 2012 21:03:50 +0000 (22:03 +0100)]
Merge remote-tracking branch 'origin/master'
Stefano Lattarini [Tue, 6 Mar 2012 21:03:22 +0000 (22:03 +0100)]
Merge branch 'maint'
* maint:
news: describe recently-fixed bug in vala support
depcomp: add support for IBM xlc/xlC compilers
Stefano Lattarini [Tue, 6 Mar 2012 20:44:57 +0000 (21:44 +0100)]
news: describe recently-fixed bug in vala support
* NEWS (Long-standing bugs): Document fix for bug#10894, fixed
by commit 'v1.11-696-g51f61df' of 27-02-2012.
Michael Hofmannm [Mon, 5 Mar 2012 19:05:37 +0000 (20:05 +0100)]
depcomp: add support for IBM xlc/xlC compilers
* lib/depcomp (xlc): New depmode.
* NEWS, THANKS: Update.
Copyright-paperwork-exempt: yes
Peter Rosin [Tue, 6 Mar 2012 13:19:10 +0000 (14:19 +0100)]
tests: do not clobber the $CC set by AM_PROG_CC_C_O
If $CC is originally a losing compiler, AM_PROG_CC_C_O will
modify $CC. "$MAKE -e" will then clobber this modified $CC
and reintroduce the raw losing compiler causing the test
to fail, as subdir-objects is in effect.
* tests/yacc-dist-nobuild-subdir.test: Drop -e from the $MAKE
invocations. This is safe since DISTCHECK_CONFIGURE_FLAGS is not
specified in the Makefile and since the YACC override is carried
over from the configure invocation into the Makefile making it
redundant to specifiy it again in the environment for $MAKE.
Peter Rosin [Tue, 6 Mar 2012 08:50:09 +0000 (09:50 +0100)]
tests: explicitly state that our lexers do not require unistd.h
By default, GNU flex generates code that is dependent on unistd.h,
which is not portable to non-ANSI systems causing spurious test
failures.
* tests/cond35.test (tscan.l): Define YY_NO_UNISTD_H.
* tests/lex-clean.test (lexer.l): Likewise.
* tests/lex-depend.test (joe.l): Likewise.
* tests/lex-lib-external.test (foo.l): Likewise.
* tests/lex-lib.test (foo.l): Likewise.
* tests/lex-libobj.test (foo.l): Likewise.
* tests/lex-line.test (zardoz.l): Likewise.
* tests/lex-nodist.test (lexer.l): Likewise.
* tests/lex-noyywrap.test (foo.l): Likewise.
* tests/lex-pr204.test (lexer.l): Likewise.
* tests/lex-subobj-nodep.test (subl/sl.l): Likewise.
* tests/lex3.test (foo.l): Likewise.
* tests/lex5.test (foo/foo.l): Likewise.
* tests/lexvpath.test (lexer.l): Likewise.
* tests/silent-lex.test (foo.l): Likewise.
* tests/silent-many-gcc.test (foo5.l): Likewise.
* tests/silent-many-generic.test (foo5.l): Likewise.
* tests/lex-clean-cxx.test (parsefoo.lxx): Likewise. Also specify
the never-interactive option to prevent usage of the non-ANSI
function isatty(3) (from unistd.h).
* tests/lex-depend-cxx.test (joe.ll): Likewise.
* tests/README: Describe these quirks.
Peter Rosin [Tue, 6 Mar 2012 08:31:43 +0000 (09:31 +0100)]
Merge branch 'msvc'
* msvc:
scripts: support -I <dir> -L <dir> and -l <lib> for cl in compile
Peter Rosin [Tue, 6 Mar 2012 08:14:50 +0000 (09:14 +0100)]
scripts: support -I <dir> -L <dir> and -l <lib> for cl in compile
POSIX mandates that the compiler accepts a space between the -I,
-l and -L options and their respective arguments. See
http://pubs.opengroup.org/onlinepubs/
000095399/utilities/c99.html
* lib/compile (func_cl_dashl): New function with factored out code
for implementing the -l option for the cl wrapper.
(func_cl_dashL): New function with factored out code implementing
the -L option for the cl wrapper.
(func_cl_wrapper): Use func_cl_dashl to implement both -l <lib>
and -l<lib>, and func_cl_dashL to implement both -L <dir> and
-L<dir>. Also add support for -I <dir>.
(scriptversion): Update.
* tests/compile3.test: Test both with and without a space between
-I, -l and -L and their respective arguments.
* tests/compile5.test: Likewise.
* tests/compile6.test: Likewise.
* tests/compile3.test: Likewise.
* NEWS: Update.
Stefano Lattarini [Sun, 4 Mar 2012 15:00:58 +0000 (16:00 +0100)]
maint: drop 'Automake::Struct' module
Now that we require Perl 5.6, we can drop the 'Automake::Struct'
module, which was basically just a backport of Perl 5.6's
'Class::Struct' to Perl 5.5.
* automake.in: Use 'Class::Struct', not 'Automake::Struct'.
* lib/Automake/Struct.pm: Delete.
* lib/Automake/Makefile.am (dist_perllib_DATA): Remove it.
Stefano Lattarini [Sun, 4 Mar 2012 14:44:46 +0000 (15:44 +0100)]
maint: require perl 5.6 throughout
That version of perl is quite old already, so it should be OK to
require it. More importantly, it is the older perl versions the
developers can currently use for testing, thus it's safer and more
honest to just require it throughout. And anyway, we were already
requiring it in Automake::Getopt, which implied that both automake
and aclocal wouldn't have worked in practice with an older perl
version.
See also the discussion related to automake bug#10925.
* lib/Automake/ChannelDefs.pm: Adjusted to require perl 5.6.
* lib/Automake/Channels.pm: Likewise.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/Configure_ac.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/FileUtils.pm: Likewise.
* lib/Automake/General.pm: Likewise.
* lib/Automake/Item.pm: Likewise.
* lib/Automake/ItemDef.pm: Likewise.
* lib/Automake/Location.pm: Likewise.
* lib/Automake/Options.pm: Likewise.
* lib/Automake/Rule.pm: Likewise.
* lib/Automake/RuleDef.pm: Likewise.
* lib/Automake/Struct.pm: Likewise.
* lib/Automake/VarDef.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/Version.pm: Likewise.
* lib/Automake/Wrap.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.
Stefano Lattarini [Sun, 4 Mar 2012 12:02:57 +0000 (13:02 +0100)]
cosmetics: remove useless escaping for "'" character
Stefano Lattarini [Sun, 4 Mar 2012 11:56:54 +0000 (12:56 +0100)]
test defs: remove redundant and unused requirements
* tests/defs (xsi-bin-sh, xsi-shell): Remove these requirements,
they have never been used.
(cygpath, cscope): Recognizing these explicitly is mostly redundant;
just merge them with the default "catch all" rule, and adjust that
accordingly.
(bzip2): Adjust some outdated comments.
Stefano Lattarini [Fri, 2 Mar 2012 20:53:52 +0000 (21:53 +0100)]
tests: fix spurious failure on case-insensitive file systems
See automake bug#10866.
* tests/java-uninstall.test: Relax the test a little to cater to
case-insensitive file systems, like HFS+ on MacOS X.
Stefano Lattarini [Fri, 2 Mar 2012 22:06:02 +0000 (23:06 +0100)]
news: more about planned backward incompatibilities
* NEWS (Future backward-incompatibilities): Starting from the next
major Automake versions, the parallel testsuite driver will be used
by default, instead of the serial testsuite driver as in the past.
Stefano Lattarini [Fri, 2 Mar 2012 21:50:21 +0000 (22:50 +0100)]
maintcheck: fix few spurious failures
* syntax-checks.mk: Fix some spurious failures by tightening and/or
tweaking few checks so that some false positives end up whitelisted.
Stefano Lattarini [Fri, 2 Mar 2012 21:24:35 +0000 (22:24 +0100)]
tests: fix spurious failure due to exported MAKEINFO
* tests/txinfo30.test: Unset variable MAKEINFO, as its content could
take precedence over our faked makeinfo script and cause a spurious
failure. Reported as part of automake bug#10866. Add trailing ':'
command since we are at it.
Stefano Lattarini [Fri, 2 Mar 2012 21:07:58 +0000 (22:07 +0100)]
tests: fix spurious failure in a vala test
* tests/vala-mix2.test: Append to 'configure.ac' rather than to
'configure.in'. Reported as part of automake bug#10866, and also
revealed by "make maintainer-check".
Stefano Lattarini [Sun, 26 Feb 2012 13:17:36 +0000 (14:17 +0100)]
self checks: relax tests on cleanup
Some find(1) implementations have problems operating recursively on
directories having subdirectories with null permissions, even when
the permissions of such subdirectory should be fixed by find before
it descends into them; for example, with this setup:
% mkdir a a/b
% chmod 000 a/b
a command like this:
% find a -type d ! -perm -700 -exec chmod u+rwx '{}' ';'
fails with this diagnostic on MacOS X 10.7:
find: a/b: Permission denied
and with this diagnostic on Solaris 10:
find: cannot read dir a/b: Permission denied
The problem is that our self checks were simply demanding too much
from our cleanup trap: our tests never use subdirectories with null
permissions, so it doesn't matter if the cleanup trap fails to
handle those. Just relax the self checks to avoid such useless
testsuite noise.
* tests/self-check-cleanup.tap: Only try directories missing
write permissions, not with null permission. That should be
enough for our usages.
Peter Rosin [Fri, 2 Mar 2012 15:38:08 +0000 (16:38 +0100)]
Merge branch 'msvc'
* msvc:
news: add entry about recent 'ar-lib' changes
Peter Rosin [Fri, 2 Mar 2012 15:27:31 +0000 (16:27 +0100)]
news: add entry about recent 'ar-lib' changes
* NEWS: Add information about recent 'ar-lib' changes.
Peter Rosin [Thu, 1 Mar 2012 08:30:45 +0000 (09:30 +0100)]
scripts: recognize the "q", "s" and "S" actions/modifiers in ar-lib
* lib/ar-lib: Implement the "q" (quick) action as a synonym
for "r" (replace). Ignore "s" (symbol index) and "S" (no symbol
index) when used as modifiers and "s" when used as a command,
there is simply no way for Microsoft lib to not update the
symbol table index in the archive.
(scriptversion): Update.
* tests/ar-lib.test: Check the added behavior. Also add checks
for the recently added "u" (update) and "v" (verbose) modifiers.
Peter Rosin [Fri, 2 Mar 2012 10:49:18 +0000 (11:49 +0100)]
Merge branch 'fix-vala-test'
* fix-vala-test:
tests: fix (harmless) botched merge
Peter Rosin [Fri, 2 Mar 2012 10:48:41 +0000 (11:48 +0100)]
tests: fix (harmless) botched merge
Commit v1.11-1750-g9928ea5 of 2012-01-16 (Merge branch 'maint')
reordered the macro calls so that AM_PROG_AR ended up after
AC_PROG_LIBTOOL, which is not allowed. This error went by
undetected since AC_PROG_LIBTOOL was redefined, but that also
removed the ordering requirement making the error benign.
* tests/vala.test: Put AM_PROG_AR before AC_PROG_LIBTOOL.
Peter Rosin [Fri, 2 Mar 2012 10:04:05 +0000 (11:04 +0100)]
Merge branch 'maint' into msvc
Peter Rosin [Thu, 1 Mar 2012 08:30:45 +0000 (09:30 +0100)]
scripts: recognize the "q", "s" and "S" actions/modifiers in ar-lib
* lib/ar-lib: Implement the "q" (quick) action as a synonym
for "r" (replace). Ignore "s" (symbol index) and "S" (no symbol
index) when used as modifiers and "s" when used as a command,
there is simply no way for Microsoft lib to not update the
symbol table index in the archive.
(scriptversion): Update.
* tests/ar-lib.test: Check the added behavior. Also add checks
for the recently added "u" (update) and "v" (verbose) modifiers.
Peter Rosin [Wed, 29 Feb 2012 19:21:30 +0000 (20:21 +0100)]
tests: do not try to use ar(1) when $AR points to something else
* tests/libobj10.test: Move the archive listing commands to the
Makefile, so that $AR - as determined by configure - can be
used.
* tests/libobj17.test: Likewise.
Peter Rosin [Wed, 29 Feb 2012 19:20:17 +0000 (20:20 +0100)]
tests: make tests behave for the AR=lib case
These below tests were left mostly as-is when AM_PROG_AR was
introduced (with libobj16b being the exception, that test was
forgotten or has regressed since), in a misguided attempt to
not make them diverge from the original problem reports.
Modernize them so that they do not FAIL when $AR is Microsoft
'lib'.
* tests/libobj16b.test: Add AM_PROG_AR to configure.ac and remove
the no-longer-needed -Wno-extra-portability option when invoking
automake.
* tests/pr300-lib.test: Likewise.
* tests/pr300-ltlib.test: Likewise.
* tests/pr307.test: Likewise.
* tests/pr401.test: Likewise. Also fetch the 'ar-lib' script.
* tests/pr401b.test: Likewise.
* tests/pr401c.test: Likewise.
Stefano Lattarini [Wed, 29 Feb 2012 18:50:18 +0000 (19:50 +0100)]
Merge branch 'maint'
* maint:
vala: fix 'valac' calls for projects with mixed Vala/C
vala: expose automake bug#10894
Dave Goodell [Tue, 28 Feb 2012 19:49:22 +0000 (13:49 -0600)]
tests: fix spurious failure with Portland Compilers
* tests/silent-many-generic.test (configure.ac): Be more careful
in the workaround to avoid spurious failures with C++ compilers
containing the string "CC" in their names; this avoids spurious
failures with at least the Sun Studio C++ compiler (when named
"sunCC") and the Portland Group C++ Compiler ("pgCC").
Also handle arguments with whitespace correctly in the 'am--cxx'
temporary wrapper.
* THANKS: Update.
Co-authored-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Copyright-paperwork-exempt: yes
Stefano Lattarini [Tue, 28 Feb 2012 19:07:34 +0000 (20:07 +0100)]
tests: fix spurious failure when dependency tracking is unavailable
Report by Dave Goodell. See automake bug#8880.
* tests/yacc-dist-nobuild.test: Run the sanity check that aims at
ensuring we really cover the expected code paths in a new build
directory, to avoid spurious failures when automatic dependency
tracking is disabled.
Stefano Lattarini [Mon, 27 Feb 2012 20:48:03 +0000 (21:48 +0100)]
vala: fix 'valac' calls for projects with mixed Vala/C
Fixes automake bug#10894.
* automake.in (lang_vala_finish_target): Strip non-vala files
from the dependencies of vala stamps, and from the invocation
of valac compiler. Related refactorings.
* tests/Makefile.am (XFAIL_TESTS): Remove 'vala-mix2.test'.
Stefano Lattarini [Mon, 27 Feb 2012 20:16:22 +0000 (21:16 +0100)]
vala: expose automake bug#10894
* tests/vala-mix2.test: New test.
* tests/list-of-tests.mk: Add it.
* tests/Makefile.am (XFAIL_TESTS): Likewise.
* THANKS: Update.
Stefano Lattarini [Mon, 27 Feb 2012 08:34:29 +0000 (09:34 +0100)]
cosmetics: remove a duplicated copyright line
* tests/list-of-tests.mk: Remove a duplicated copyright line.
Stefano Lattarini [Mon, 27 Feb 2012 08:28:47 +0000 (09:28 +0100)]
coverage: --program-transform shouldn't transform too much
Stemmed from a report by Vladimir 'φ-coder/phcoder' Serbinenko:
<http://lists.gnu.org/archive/html/automake/2012-02/msg00025.html>
* tests/transform3.test: New test, checking that --program-transform
does not transform too much stuff (in particular, pkglibexecdir,
pgklibdir and pkgdatadir).
* tests/list-of-tests.mk: Add it.
* THANKS: Update.
Stefano Lattarini [Sun, 26 Feb 2012 12:31:00 +0000 (13:31 +0100)]
tests: avoid spurious failure (line too long in awk)
* tests/parallel-tests-many.test: Use perl, not awk, to write the
Makefile.am with (deliberately) overly long TESTS content, as some
inferior awk implementations (e.g., Solaris 10 /usr/bin/awk) are
unable to handle the long lines used there and die with errors like:
"awk: string too long near line 5".
Stefano Lattarini [Sun, 26 Feb 2012 12:10:19 +0000 (13:10 +0100)]
tests: avoid spurious failures when awk is "traditional awk"
* tests/Makefile.am (do_subst): Also substitute '@AWK@'.
* tests/defs-static.in ($AWK): New, user-overridable and defaulting
to the substituted '@AWK@'.
* tests/defs (fetch_tap_driver): When the shell+awk implementation
of the TAP driver is required, export AM_TAP_AWK to point to a
properly capable awk, since the default awk might be a "traditional"
implementation, which won't be enough for our driver. This is the
right fix, since a proper setting of AM_TAP_AWK in the driver's
environment is expected (and documented to be required) in real
world uses of 'tap-driver.sh'.
Stefano Lattarini [Sun, 26 Feb 2012 10:22:32 +0000 (11:22 +0100)]
tests: avoid many spurious failures for shells with busted 'set -e'
Some versions of the BSD Korn shell wrongly bail out when the
'errexit' shell flag is active and the left-hand command in a
"&&" list fails and that list is the *last* command of an entry
in a "case" statement.
* tests/defs (gcc, g++, gcj): Work around that.
Stefano Lattarini [Wed, 22 Feb 2012 09:12:02 +0000 (10:12 +0100)]
aclocal: don't create /usr/share/aclocal as empty
Related to automake bug#10791.
Since automake 1.11.2, aclocal no longer succeeds if the system
acdir '${datadir}/aclocal' (i.e., "/usr/share/aclocal" when
${prefix} is "/usr") does not exist. So we now have a directory
*installed empty by default*, but whose existence is required by
aclocal in order for it to function at all. This might be
confusing, and sounds like asking for trouble in the long term.
So we now also install a simple README file in that directory,
which briefly explains its purpose and warn that its existence
is required by the normal aclocal functioning.
* m4/acdir/README: New file.
* m4/Makefile.am (dist_system_ac_DATA): Add it.
* m4/acdir/.placeholder: Delete, no more needed.
* m4/Makefile.am (EXTRA_DIST): Remove it.
* THANKS: Update.
Stefano Lattarini [Sat, 25 Feb 2012 21:01:17 +0000 (22:01 +0100)]
hacking: document format for git commit messages
* HACKING (Writing a good commit message): New section.
(Working with git): A related minor adjustment.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 25 Feb 2012 13:38:22 +0000 (14:38 +0100)]
docs: improve 'dist-hook' documentation
* doc/automake.texi (The dist Hook): Explicitly document the fact
that the dist-hook should account for the case where the source
tree is read-only, mostly for the benefit of distcheck. Since
we are at it, do some minor unrelated rewordings, and remove
obsolescent advice. Motivated by the discussion on automake
bug#10878.
* tests/disthook.test: New test.
* tests/disthook-perms.test: Delete as obsolete.
* tests/list-of-tests.mk: Adjust.
Stefano Lattarini [Sat, 25 Feb 2012 10:11:33 +0000 (11:11 +0100)]
docs: improve "make distcheck" documentation
* doc/automake.texi (Checking the Distribution): The fact that
"make distcheck" uses a read-only srcdir wasn't documented clearly
enough here. Fix that. Since we are at it, be more explicit
about the steps undertaken by "make distcheck", and re-organize
this section a bit. Motivated by the discussion on automake
bug#10878.
(distcleancheck): Rename this node (in the "FAQ" section) ...
(Errors with distclean): ... to this.
Add a proper "FIXME" comment.
Stefano Lattarini [Sat, 25 Feb 2012 08:43:51 +0000 (09:43 +0100)]
cosmetics: proper capitalization and full stops in 'm4/depend.m4'
Stefano Lattarini [Fri, 24 Feb 2012 17:34:04 +0000 (18:34 +0100)]
coverage: dist-hook and distcheck-hook can modify file permission
See automake bug#10878.
* tests/dist-hook-perms.test: New test, checking that the user can
use the 'dist-hook' target to modify permissions of distributed
files before putting them in the distribution tarball.
* tests/distcheck-writable-srcdir.test: New test, checking that the
user can use 'distcheck-hook' to ensure his packages is built by
"make distcheck" with a writable srcdir. This goes against the GNU
Coding Standards, but some package authors might not care about
them too much, and it's nice to support their use case too.
* tests/list-of-tests.mk: Add them.
Jim Meyering [Sat, 25 Feb 2012 11:37:25 +0000 (12:37 +0100)]
tests: avoid spurious failure when gcj is not installed
Since yesterday's commit, v1.11-2019-g4d2bf42,
the gcj4 test would fail when gcj is not installed.
* tests/defs-static.in (GNU_GCJ, GNU_GCJFLAGS): Define.
* tests/Makefile.am (do_subust): Add those to the list of
substituted symbols.
Stefano Lattarini [Fri, 24 Feb 2012 14:22:25 +0000 (15:22 +0100)]
tests: look for GNU Java compiler at configure time
Do this for consistency with what is done with other compilers.
* configure.ac: Look for GNU java compiler at configure time.
* tests/defs (gcj): Adjust and simplify.
($am__tool_prefix): Remove definition, it's not used anymore.
Stefano Lattarini [Fri, 24 Feb 2012 13:35:06 +0000 (14:35 +0100)]
refactor: in Automake::Options (no semantic change)
* lib/Automake/Options.pm: Prefer leading spaces to leading tabs
throughout. Minor whitespace and comment changes.
(_process_option_list): Simple refactoring to make the code more
pleasant to read and easier to modify in the future. This
refactoring also reduces code duplication, with the help of ...
(_option_must_be_from_configure, _is_valid_easy_option): ... these
new internal subroutines.
* tests/tar3.test: Enhance.
* tests/silent-amopts.test: New, checks that automake complains if
the 'silent-rules' option is used in AUTOMAKE_OPTIONS.
* tests/list-of-tests.mk: Add it.
Stefano Lattarini [Fri, 24 Feb 2012 12:27:53 +0000 (13:27 +0100)]
cosmetics: typofixes and whitespace changes
* configure.ac: Fix a typo in comments.
* aclocal.in: Get rid of latest form-feed (^L) usages.
* automake.in: Likewise.
Stefano Lattarini [Wed, 22 Feb 2012 21:39:03 +0000 (22:39 +0100)]
tests: looks for GNU compilers at configure time
This way, if the generic C compiler determined configure time is
recognized to be the GNU C compiler, we can reuse it instead of
looking for a compiler named "gcc" (over and over again) in the
test scripts requiring the GNU C compiler. Ditto for the C++,
Fortran, and Fortran 77 compilers.
This change will improve coverage by allowing us to more easily
use non-default GNU compilers throughout the testsuite.
And as a bonus, this change also removes a weakness from our
testsuite that could cause spurious failures when flags passed
to the generic compilers were erroneously reused for the GNU
compilers; see automake bug#10859.
* configure.ac: Look for the GNU compilers explicitly. Improve
some configure output and diagnostic since we are at it.
* tests/defs-static.in ($GNU_CC, $GNU_CXX, $GNU_FC, $GNU_F77):
Initialize with the values determined at configure time (while
allowing user overrides).
* tests/Makefile.am (do_edit): Also substitute the configure-time
values of GNU_CC, GNU_CXX, GNU_FC and GNU_F77.
* tests/defs (gcc, g++, gfortran, g77): Use the values for the GNU
compilers determined at configure time (i.e., $GNU_CC for the GNU
C compiler, and so on).
Stefano Lattarini [Thu, 23 Feb 2012 22:56:38 +0000 (23:56 +0100)]
docs, news: document planned removal of obsolete macros and features
* NEWS (Future backward-incompatibilities): Document planned removal
of several superseded and/or obsoleted macros, of the $(mkdir_p)
variable and @mkdir_p@ substitution, and of the support for the
two- or three-arguments invocation forms of AM_INIT_AUTOMAKE.
* doc/automake.texi: Likewise.
Stefano Lattarini [Thu, 23 Feb 2012 23:00:35 +0000 (00:00 +0100)]
docs: remove reference to lzma support, it has been removed
Support for lzma compression in distribution tarball has been
removed in commit 'v1.11-1674-g02e9072' of 01-01-2012, "dist:
remove support for lzma (superseded by xz and lzip)", but was
still documented in the manual.
* doc/automake.texi: Remove references to the 'dist-lzma' option
and to the lzma compression support.
Stefano Lattarini [Thu, 23 Feb 2012 22:34:08 +0000 (23:34 +0100)]
cosmetics: fixlet in comment in automake
* automake.in ($configure_dist_common): In the associated comment,
refer to scanning of 'configure.ac', not 'configure.in'.
Stefano Lattarini [Thu, 23 Feb 2012 21:47:42 +0000 (22:47 +0100)]
maint: assume 'test -x' is portable
* lib/Makefile.am (installcheck-local): To verify that the installed
scripts are actually executable, simply use 'test -x', instead of
resorting to perl and its '-x' file operator. Today, 'test -x'
should today be portable to any non-museum system. Since we are at
it, improve diagnostic in case of failure.
Stefano Lattarini [Thu, 23 Feb 2012 21:36:49 +0000 (22:36 +0100)]
deptrack: avoid few forks in configure (minor optimization)
* m4/depend.m4 (_AM_DEPENDENCIES): Use 'echo > file' instead of
'touch file' to ensure the creation of a dummy file. Adjust the
comment that explains why we can't simply use ': > file': the
problem this latter idiom tickles is present also with Solaris 10
/bin/sh, not merely with Solaris 8 /bin/sh.
Stefano Lattarini [Thu, 23 Feb 2012 21:06:14 +0000 (22:06 +0100)]
maintcheck: remove an obsolete check
* syntax-checks.mk (sc_perl_local_no_parens): Remove, we don't even
allow the use of local but for the '$_' and '$~' special variables.
(syntax_check_rules): Adjust.
Stefano Lattarini [Thu, 23 Feb 2012 21:00:49 +0000 (22:00 +0100)]
news: update w.r.t. change in quoting format
* NEWS (New in 1.11.1a): State that we prefer to quote 'like this'
or "like this" rather than `like this', as according to the new GCS
recommendations.
Stefano Lattarini [Thu, 23 Feb 2012 19:50:41 +0000 (20:50 +0100)]
automake: do not quote `like this', as per GCS recommendation
* automake.in: Convert comments, diagnostic and help screen to the
use of new quoting format 'like this' or "like this" rather than
`like this'.
* tests/stdlib2.test: Adjust.
* tests/ltinstloc.test: Likewise.
* tests/location.test: Likewise.
* tests/libtool8.test: Likewise.
* tests/ldadd.test: Likewise, and prefer trailing ':' over trailing
'Exit 0'.
Stefano Lattarini [Thu, 23 Feb 2012 19:41:10 +0000 (20:41 +0100)]
aclocal: do not quote `like this', as per GCS recommendation
* aclocal.in: Convert comments, diagnostic and help screen
to the use of new quoting format 'like this' or "like this"
rather than `like this'.
Stefano Lattarini [Thu, 23 Feb 2012 19:25:26 +0000 (20:25 +0100)]
pm: do not quote `like this', as per GCS recommendation
This patch converts the internal perl modules used by automake and
aclocal to the use of new quoting format 'like this' or "like this"
rather than `like this'.
* lib/Automake/ChannelDefs.pm, lib/Automake/Channels.pm,
lib/Automake/Condition.pm, lib/Automake/Configure_ac.pm,
lib/Automake/DisjConditions.pm, lib/Automake/FileUtils.pm,
lib/Automake/General.pm, lib/Automake/Item.pm,
lib/Automake/Rule.pm, lib/Automake/Getopt.pm,
lib/Automake/Options.pm, lib/Automake/Struct.pm,
lib/Automake/VarDef.pm, lib/Automake/Variable.pm,
lib/Automake/Version.pm, lib/Automake/XFile.pm: Update and
adjust quoting format throughout, in comments and diagnostic.
Some minor related rewordings and reformatting since we are
at it.
Stefano Lattarini [Thu, 23 Feb 2012 18:36:20 +0000 (19:36 +0100)]
m4: do not quote `like this', as per GCS recommendation
This patch converts the files comprising the automake's own build
system to the use of new quoting format 'like this' or "like this"
rather than `like this'.
* m4/auxdir.m4, m4/ccstdc.m4, m4/depend.m4, m4/depout.m4, m4/tar.m4,
m4/init.m4, m4/maintainer.m4, m4/make.m4, m4/missing.m4, m4/vala.m4,
m4/mkdirp.m4, m4/sanity.m4, m4/silent.m4, m4/strip.m4: Update and
adjust quoting format throughout, in comments and diagnostic. Some
minor related rewordings and reformatting since we are at it. Bump
serial numbers.
Stefano Lattarini [Thu, 23 Feb 2012 18:21:00 +0000 (19:21 +0100)]
build: do not quote `like this', as per GCS recommendation
This patch converts the files implementing the automake's own build
system to the use of new quoting format 'like this' or "like this"
rather than `like this'.
* bootstrap, configure.ac, syntax-checks.mk, Makefile.am,
lib/Makefile.am, m4/Makefile.am, syntax-checks.mk: Update quoting
format throughout, in comments and diagnostic. Some minor related
rewordings and reformatting since we are at it.
Stefano Lattarini [Thu, 23 Feb 2012 14:40:31 +0000 (15:40 +0100)]
hacking: update advice w.r.t. release process
* HACKING: Don't describe the obsolete 'git-release' target anymore.
Instead, document the new and improved targets 'git-tag-release' and
'git-upload-release' (introduced in commit v1.11-674-gaf5f939 of
25-01-2012, "release: revamp rules to tag and upload the releases").
Stefano Lattarini [Thu, 23 Feb 2012 14:27:36 +0000 (15:27 +0100)]
hacking: do not quote `like this', as per GCS recommendation
* HACKING: Quote 'like this' or "like this", not `like this'. This
is done for consistency with the new recommendations in the GNU
Coding Standards, and because I've come to actually prefer the '...'
and "..." quoting format over the `...' one.
Stefano Lattarini [Thu, 23 Feb 2012 14:15:26 +0000 (15:15 +0100)]
am: do not quote `like this', as per GCS recommendation
This patch converts the automake-provided '*.am' fragments, and
related files, to the use of new quoting format 'like this' or
"like this" rather than `like this'.
* lib/am/check.am: Update quoting format throughout, in comments
and diagnostic. Some related rewordings, reformatting, and removal
of redundant commands since we are at it.
* lib/am/configure.am: Likewise.
* lib/am/dejagnu.am: Likewise.
* lib/am/depend2.am: Likewise.
* lib/am/distdir.am: Likewise.
* lib/am/inst-vars.am: Likewise.
* lib/am/install.am: Likewise.
* lib/am/lang-compile.am: Likewise.
* lib/am/lisp.am: Likewise.
* lib/am/ltlib.am: Likewise.
* lib/am/mans.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/am/remake-hdr.am: Likewise.
* lib/am/subdirs.am: Likewise.
* lib/am/tags.am: Likewise.
* lib/am/texi-vers.am: Likewise.
* lib/am/texibuild.am: Likewise.
* lib/am/texinfos.am: Likewise.
* lib/am/yacc.am: Likewise.
Stefano Lattarini [Thu, 23 Feb 2012 12:07:57 +0000 (13:07 +0100)]
tests: quote 'like this', not `like this', as per GCS recommendation
This patch converts the automake testsuite and related files, to
the use of new quoting format 'like this' or "like this" rather
than `like this'.
This is done for consistency with the new recommendations in the GNU
Coding Standards, and, well, because I've come to actually prefer
the '...' and "..." quoting formats over the `...' one.
* tests/README: Update quoting format throughout. Remove some
"excessive" use of quoting, and throw in minor rewording where
appropriate.
* tests/Makefile.am: Likewise, for comments.
* tests/CheckListOfTests.am: Likewise.
* tests/defs-static.in: Likewise.
* tests/defs: Likewise.
* tests/trivial-test-driver: Likewise.
* Many tests/*.tap, tests/*.test and tests/*.sh files: Likewise,
and for the diagnostic and informational messages as well.
* tests/gen-testsuite-part: Likewise, and for the generated tests
as well.
Stefano Lattarini [Wed, 22 Feb 2012 13:27:17 +0000 (14:27 +0100)]
spy: "rm -f" and "rm -rf" without args are portable
According to recent testing by Eric Blake, it seems that all
non-museum rm(1) implementations don't complain if called without
file operands, *if* the '-f' option is used. This behaviour will
likely be mandated by future versions of the POSIX standard as
well.
We'd like to start assuming this rm(1) behaviour in future Automake
releases, in order to simplify some automake-provided cleanup rules.
So, for the moment, we add a new "spy" test in our test suite, to
try ensuring that all the rm(1) implementation we encounter "in the
wild" truly behaves as expected in this regard.
For more references, see this discussion on the bug-autoconf list:
<http://lists.gnu.org/archive/html/bug-autoconf/2012-02/msg00002.html>
which sprang from coreutils bug#10819:
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10819>
and brought to the POSIX issue#542:
<http://austingroupbugs.net/view.php?id=542>
which has been accepted and will ensure that future version of the
POSIX standards will mandate that 'rm' shouldn't complain if called
without file operands, when the '-f' option is in use.
* tests/spy-rm.test: New test.
* tests/list-of-tests.mk: Add it.
Stefano Lattarini [Wed, 22 Feb 2012 11:30:38 +0000 (12:30 +0100)]
tests: avoid spurious failures under "make distcheck"
* tests/tap-setup.sh: Pass also '-f' option to 'cp' invocations,
so that files that have already been copied in without write
permissions will still be overwritten where needed, instead of
causing a spurious testsuite failure. Issue seen when the
testsuite is run under "distcheck".
* tests/defs (get_shell_script): Remove target file before
overwriting it, for the same reason. Rework code flow a bit
since we are at it.
Stefano Lattarini [Wed, 22 Feb 2012 10:30:54 +0000 (11:30 +0100)]
fixup: avoid spurious failure for 'parallel-tests-many.test'
* tests/parallel-tests-many.test: Adjust grepping of "make check"
and "make recheck" output to match the new format of the testsuite
summary. Remove redundant 'set -e' call since we are at it.
Stefano Lattarini [Tue, 21 Feb 2012 18:47:36 +0000 (19:47 +0100)]
tests: prefer 'configure.ac' over 'configure.in'
With this change, our testsuite now uses 'configure.ac' as the
name for the typical autoconf input, instead of the obsolescent
'configure.in' (which has been deprecated for several years, at
least since autoconf 2.50).
Most of the test cases changed by this commit have been
automatically modified with this sed command (using GNU
sed):
sed -i 's/\<configure\(\\\?\)\.in\>/configure\1.ac/g'
* syntax-checks.mk (sc_tests_no_configure_in): New syntax check.
(syntax_check_rules): Add it.
* tests/defs: Create stub for autoconf input in 'configure.ac',
not in 'configure.in'. Adjust comments.
($AUTOCONF, $AUTOHEADER, $AUTORECONF): Remove workaround for the
infamous debian autoconf wrapper: we don't need such workaround
anymore now that we name our autoconf input as 'configure.ac'.
For more information, see commit v1.11-564-g63da492 "test defs:
hack to support autoconf-wrapper programs" of 16-12-2011.
* tests/README: Use 'configure.ac', not 'configure.in'.
* Many many tests: Likewise.
* tests/backcompat3.test: Adjust to avoid spurious failures.
* tests/backcompat5.test: Likewise.
* tests/missing6.test: Likewise.
* tests/backcompat6.test: Likewise, and extend a bit since we
are at it.
Stefano Lattarini [Wed, 28 Dec 2011 21:37:44 +0000 (22:37 +0100)]
coverage: expose automake bug#7868
Expose the command-line length limit issue that can affect the
Automake-generated parallel-tests harness, especially on systems
where this limit is smaller (e.g., MinGW/MSYS).
Suggestion by Bob Friesenhahn.
* tests/parallel-tests-many.test: New test. We have verified that
it actually exposes the bug#7868, as it passes when we opportunely
reduce the number of test cases in $(TESTS). Checked on NetBSD 5.1
64bit, Debian unstable 32bit, Solaris 10 64bit and Cygwin 1.5 32bit.
* tests/list-of-tests.mk (handwritten_TESTS): Add it.
* tests/Makefile.am (XFAIL_TESTS): Likewise.
Stefano Lattarini [Tue, 21 Feb 2012 21:19:16 +0000 (22:19 +0100)]
tests: remove obsoleted "icc" requirement
* tests/defs (icc): This requirement is not used anymore by any
test case, so remove it.
Stefano Lattarini [Tue, 21 Feb 2012 18:23:50 +0000 (19:23 +0100)]
readme: fix typo in tests/README
Stefano Lattarini [Tue, 21 Feb 2012 13:06:25 +0000 (14:06 +0100)]
tests: "make installcheck" shouldn't run the testsuite twice
* Makefile.am (installcheck-local): Remove. The "installcheck"
target provided by automake is already a recursive target, so
there's no need to have an 'installcheck-local' recipe that
manually recurse into 'tests/'. In fact, such a manual recursion
was causing the testsuite to be run twice by "make installcheck".
Stefano Lattarini [Tue, 21 Feb 2012 12:33:27 +0000 (13:33 +0100)]
news: minor fixlets and reorganization
* NEWS: Get rid of form-feed characters (^L) throughout the file.
Use separator lines instead (composed by 76 '~' characters), or
just an extra blank lines for older less verbose entries (those
predating the 1.8 release).
(New in 1.11.3): Move description of planned future backward
incompatibilities that won't make it to 1.12 ...
(New in 1.11a): ... in here. Quote 'like this', not `like this'.
Other minor miscellaneous rewordings and fixlets.
Stefano Lattarini [Tue, 21 Feb 2012 09:03:17 +0000 (10:03 +0100)]
cosmetics: few typofixes
Stefano Lattarini [Mon, 20 Feb 2012 17:33:50 +0000 (18:33 +0100)]
automake: new option 'serial-tests'
Currently, automake offers a 'parallel-tests' option to enable the
use of the parallel testsuite harness in the generated Makefiles,
but no option to explicitly state the intention of using the older
serial testsuite driver (which is currently the default).
This makes the parallel test harness seems like a second-class
citizen (while actually it should be the other way around); more
importantly, it will prevent us from making the parallel harness
be the default one in future automake versions, since the users
of the serial harness would then have no way to instruct automake
to continue using it.
We solve all of this by introducing a new 'serial-tests' option.
* lib/Automake/Options.pm (_process_option_list): Recognize the
new option, and related minor refactoring.
* tests/serial-tests.test: New test.
* tests/list-of-tests.mk: Add it.
* doc/automake.texi: Update.
* NEWS: Likewise.
Stefano Lattarini [Mon, 20 Feb 2012 13:04:46 +0000 (14:04 +0100)]
tests: fix a timestamp issue, and other minor buglets
Reported by Panther Martin in automake bug#10848.
* tests/conffile-leading-dot.test: Add a proper '$sleep' invocation,
to avoid spurious failures on fast systems without sub-second
timestamp resolutions. Add other minor related and unrelated
improvements and fixlets since we are at it.
Stefano Lattarini [Sun, 19 Feb 2012 17:43:28 +0000 (18:43 +0100)]
automake: new option to print location of scripts and data files
With this change, we add a new automake option '--print-libdir'
that prints (on stdout) the path of the directory containing the
Automake-provided scripts (e.g., 'missing' and 'install-sh') and
data files (e.g., INSTALL or texinfo.tex).
Suggestion by Nick Bowler. See also automake bug#10473.
* automake.in (parse_arguments): Handle the new option.
(usage): Mention it.
* doc/automake.texi (automake Invocation): Document it.
* NEWS: Update.
* tests/print-dir.test: New test.
* tests/list-of-tests.mk: Add it.
Stefano Lattarini [Sun, 19 Feb 2012 16:12:55 +0000 (17:12 +0100)]
docs: prefer the awk+sh TAP driver over the perl one
We had completed our shell+awk implementation of the TAP driver
months ago, but never documented it in the manual, continuing to
document only the "prototype" written in perl instead. Time to
fix this, before the 1.12 release.
* doc/automake.texi (Use TAP with the Automake test harness): Now
we document the use of the awk+shell implementation of our TAP
driver, rather than of the perl one.
* tests/tap-doc2.test: Adjust to use the shell+awk implementation
of the TAP driver.
Stefano Lattarini [Sun, 19 Feb 2012 13:53:53 +0000 (14:53 +0100)]
tests: be stricter in determining whether "make -jN" works
* tests/parallel-tests3.test: With at least Solaris 10 CCS make,
"make -jN" does not fail, but merely prints a warning about
"DistributedMake -j option" being ignored. This was causing this
test case to fail spuriously. So we now use a stricter check in
determining whether make works in parallel mode. Since we are at
it, we try to cater also to Sun Distributed make, which understands
"-j N" but *not* "-jN".
Stefano Lattarini [Sun, 19 Feb 2012 10:48:08 +0000 (11:48 +0100)]
tests: don't trust exit status of "make -k"
* tests/parallel-tests-extra-programs.test: Unless $MAKE is GNU
make, don't trust the exit status of "$MAKE -k". Fixes a spurious
failure with OpenBSD 5.0 make and NetBSD 5.1 make.
Stefano Lattarini [Sun, 19 Feb 2012 10:00:45 +0000 (11:00 +0100)]
tests: fix race condition in 'self-check-dir.tap'
* tests/self-check-dir.tap (do_check): Don't fail if "ls -l" fails.
Stefano Lattarini [Sat, 18 Feb 2012 12:59:26 +0000 (13:59 +0100)]
parallel-tests: fix another BSD parallel make issue
When BSD make is run in parallel mode, it apparently strips any
leading directory component from the automatic variable '$*' (of
course, against what POSIX mandates). This was causing FreeBSD 9.0
make and NetBSD 5.1 make to spuriously fail with automake-generated
test harnesses if subdir tests were present *and* make was being
run in parallel mode. This issue affected also the Automake own
testsuite.
* lib/am/check2.am (am__set_b): New internal variable.
(%OBJ%, %EXT%.log, %EXT%$(EXEEXT).log): Use it to work around
the described BSD make issue.
* tests/parallel-tests3.test: Enhanced to expose the bug.
* tests/parallel-tests-subdir.test: Enhance a little, since we
are at it.
* NEWS: Update.
Stefano Lattarini [Sat, 18 Feb 2012 08:47:57 +0000 (09:47 +0100)]
tests: avoid FreeBSD make VPATH issues in more tests (see bug#7884)
See also similar change 'v1.11-755-g818bc40' of 07-02-2012,
"tests: work around bug#7884 in many yacc/lex tests". The
rationale for this change is basically the same.
* tests/lex-lib-external.test: Use "yl_distcheck" instead of
bare "$MAKE distcheck" to avoid extra failures caused by
automake bug#7884.
* tests/lex-noyywrap.test: Likewise.
* tests/lex-libobj.test: Likewise.
* tests/man6.test: This test suffers from the same FreeBSD make
incompatibility in VPATH handling that is the source of automake
bug#7884. Since this is caused by rules that are defined in the
Makefile.am by the test itself, rather that being generated by
automake, the best thing to do is to skip this test if we detect
the presence of said make incompatibility (through the function
'useless_vpath_rebuild').
* tests/man8.test: Likewise.
Stefano Lattarini [Sat, 18 Feb 2012 08:26:30 +0000 (09:26 +0100)]
cosmetics: remove extra trailing whitespace in configure.ac
Peter Rosin [Fri, 17 Feb 2012 23:07:11 +0000 (00:07 +0100)]
Merge branch 'yacc-quote-fix'
Stefano Lattarini [Fri, 17 Feb 2012 22:50:30 +0000 (23:50 +0100)]
tests: avoid spurious failure with FreeBSD make
* tests/parallel-tests-extra-programs.test: FreeBSD make seems to
write (some) diagnostic messages on stdout instead than on stderr,
so now we also grep the stdout for the expected make diagnostic.
Peter Rosin [Fri, 17 Feb 2012 21:09:38 +0000 (22:09 +0100)]
tests: fix broken quoting in the generated yacc grammar
Fixes problem introduced by v1.11-1912-ge0906b7 "tests: avoid
spurious failure with non-bison yacc" from 12-02-2012.
* tests/suffix10.tap (Makefile.am): Avoid outer single quotes
when we need to produce single quotes.
Stefano Lattarini [Fri, 17 Feb 2012 15:01:25 +0000 (16:01 +0100)]
fixup: always use correct path for automake/aclocal wrappers
Otherwise, bootstrapping from a git checkout won't work anymore.
Issue introduced in today's commit 'v1.11-1974-ga98e58f'.
* doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Export PATH in a
way that makes the automake and aclocal wrappers truly accessible
(the location of this wrappers has been modified in a recent commit,
but this makefile hadn't been updated accordingly).
(update_mans): Likewise.
Stefano Lattarini [Fri, 17 Feb 2012 14:32:10 +0000 (15:32 +0100)]
tests: fix spurious failure in VPATH build
* tests/self-check-dir.tap: Adjust to handle running in a VPATH
build correctly.
Stefano Lattarini [Fri, 17 Feb 2012 14:20:03 +0000 (15:20 +0100)]
tests: fix many spurious failures in VPATH builds
The 'is' helper script, used by some test cases since commit
'v1.11-1830-g96401cb' of 08-02-2012, "tests: better way to compare
lists in Makefile rules", is not available in VPATH builds, since
it resides in $(srcdir), nor in $(builddir), and only $(builddir)
is added to $PATH in the test script. This was causing spurious
failures.
Solve this issue by re-organizing a bit the layout and placing of
wrapper and help scripts used by the testsuite. This reorganization
is by no mean complete, but should be enough to solve the VPATH
issues.
* tests/is: Moved ...
* tests/ax/is: ... here
* tests/automake.in: Moved ...
* tests/wrap/automake.in: ... here.
* tests/aclocal.in: Moved ...
* tests/wrap/aclocal.in: ... here.
* tests/defs-static.in ($am_bindir, $PATH): Adjust.
* configure.ac (AC_CONFIG_FILES): Likewise.
* tests/Makefile.am (EXTRA_DIST, check_SCRIPTS): Likewise.
* tests/get-sysconf.test: Likewise.
* .gitignore: Likewise.
Stefano Lattarini [Fri, 17 Feb 2012 12:46:53 +0000 (13:46 +0100)]
tests: relax a test to cater to NetBSD make
* tests/parallel-tests-empty-testlogs.test: When $(TESTS) is empty,
NetBSD 5.1 make ends up defining $(TESTS_LOGS) to ".log" rather than
to the empty string (as would be expected). This behaviour was
causing a check in this test case to fail. But that check was in
fact overly strict, since our recipes are smart enough to work
around the botched-up substitution. Also, the failure wasn't a
regression from Automake 1.11, since that version too would have
triggered the same error with NetBSD 5.1 make. So we just relax
the test a little to avoid extra noise in the testsuite.
Stefano Lattarini [Fri, 17 Feb 2012 12:29:19 +0000 (13:29 +0100)]
Merge branch 'maint'
* maint:
dryrun: $(am__dry_run) not confused by metachars in $(MAKEFLAGS)
Stefano Lattarini [Fri, 17 Feb 2012 10:52:13 +0000 (11:52 +0100)]
dryrun: $(am__dry_run) not confused by metachars in $(MAKEFLAGS)
* lib/am/header-vars.am (am__make_dryrun): Be smarter and more
correct in handling shell metacharacters in $(MAKEFLAGS).
Stefano Lattarini [Fri, 17 Feb 2012 12:14:57 +0000 (13:14 +0100)]
tests: TAP-based tests should error if no plan was specified
After this change, it will still be OK for TAP-based tests not to
report any explicit TAP plan -- but they should state *explicitly*
that they want to do so, by calling the 'plan_' function with a
proper argument (currently, either "later" or "unknonwn").
Motivated by a recent issue introduced by yesterday's commit
'v1.11-1959-g0699a84' (pointed out by Peter Rosin, and fixed
by follow-up commit 'v1.11-1961-gea44190').
* tests/tap-functions.sh (plan_): Get rid of '$have_tap_plan_',
and refactor use and initialization of '$planned_' in a way that
will allow client script to get more information on which kind
of plan (if any) has been declared by the former 'plan_' invocation.
(skip_all_): Adjust.
* tests/defs (exit trap): Only print the "lazy" TAP plan if 'plan_'
has requested that *explicitly*.
* syntax-check.mk (sc_tests_tap_plan): Remove: it's obsolete now,
since a TAP-based test that doesn't call 'plan_' explicitly won't
print any TAP plan, and the TAP driver will catch that and report
an error.
(syntax_check_rules): Adjust.
Stefano Lattarini [Fri, 17 Feb 2012 09:57:37 +0000 (10:57 +0100)]
tests: expose $(am__dry_run) limitations
Currently, the internal $(am__dry_run) macro can fail in weird ways
when $(MAKEFLAGS) contains shell metacharacters. Let's expose this
limitation in the testsuite (and fix a couple of related weaknesses
since we are at it).
* tests/make-dryrun.test: Moved ...
* tests/make-dryrun.tap: ... here, converted to TAP, and extended to
expose the described limitations. Also ...
(am_parallel_tests): Define this so that the 'gen-testsuite-part'
script won't generate a useless wrapper script.
* test/list-of-tests.mk: Update.