Ralf Wildenhues [Wed, 9 Jun 2010 20:54:35 +0000 (22:54 +0200)]
Merge branch 'maint'
Stefano Lattarini [Fri, 7 May 2010 23:27:36 +0000 (01:27 +0200)]
Modernize, improve and/or fix various test scripts.
* tests/sanity.test: Rely on the `configure.in' stub created by
`./defs', rather than writing one from scratch.
* tests/depend2.test: Likewise. Also, call `set -e' just after
the inclusion of `./defs', instead that later in the script.
* tests/canon5.test: Avoid a useless `|| Exit 1' after a call to
$AUTOMAKE, and improve the positioning of an $ACLOCAL call.
* tests/exeext4.test: Use $FGREP instead of grep, where possible.
Make auxiliary rules in the generated Makefile more silent.
These changes make some checks slighty stricter.
* tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
* tests/gettext2.test: Place final `:' at the end of the script,
rather than in the middle.
* tests/exeext.test: Call `set -e' just after the inclusion of
`./defs', instead that later in the script.
* tests/extra5.test: Likewise.
* tests/confdeps.test: Likewise. Also, prefer `mv -f' over
plain `mv', just to be sure.
* tests/depcomp.test: Enable `errexit' shell flag, with related
changes. Also, modernize the generated configure.in.
* tests/cond9.test: Likewise. Also, rely on the `configure.in'
stub created by `./defs', rather than writing one from scratch.
* tests/cond10.test: Likewise.
* tests/depcomp2.test: Likewise.
* tests/depend3.test: Likewise.
* tests/distcom7.test: Likewise.
* tests/fortdep.test: Likewise. Also, remove definition of
AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am,
since that flag is already provided by $AUTOMAKE.
* tests/mdate.test: Made stricter, by checking that Automake
actually failed, and by making a stricter grep on the error
message. Also, set shell `errexit flag'.
* tests/python2.test: Improved verbose messages.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 6 Jun 2010 19:08:59 +0000 (21:08 +0200)]
Make test `ammissing.test' stricter.
* tests/ammissing.test: Fail if $ACLOCAL succeds unexpectedly.
Enable `errexit' shell flag.
Ralf Wildenhues [Tue, 8 Jun 2010 18:52:11 +0000 (20:52 +0200)]
Merge branch 'fix-distcheck'
* fix-distcheck:
Fix error in generation of parallel tests.
Stefano Lattarini [Tue, 8 Jun 2010 18:43:43 +0000 (20:43 +0200)]
Fix error in generation of parallel tests.
* tests/defs.in ($am_skip_defs): New variable, to be used when
./defs must be sourced multiple times. If set, unset it and
only define $srcdir; otherwise, also go through the rest of
the script.
($am_defs_included): Remove, no more needed.
* tests/Makefile.am ($(parallel_tests)): Update accordingly,
using only $srcdir from defs.
Fixes potential test failures of tests that use $required.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 8 Jun 2010 18:39:33 +0000 (20:39 +0200)]
Merge branch 'maint'
Stefano Lattarini [Tue, 8 Jun 2010 14:09:18 +0000 (16:09 +0200)]
Enable `errexit' shell flag in some test scripts.
* tests/subcond.test: Enabled `errexit' shell flag, and related
minor changes.
* tests/subst.test: Likewise.
* tests/tags.test: Likewise.
* tests/unused.test: Likewise.
* tests/vars.test: Likewise.
* tests/version4.test: Likewise.
* tests/vpath.test: Likewise.
* tests/vtexi2.test: Likewise.
* tests/werror.test: Likewise.
* tests/whoami.test: Likewise.
* tests/acsilent.test: Likewise, and don't use a command
substitution that can be easily avoided.
* tests/version.test: Enabled `errexit' shell flag, and related
minor changes. Also, avoid deprecated constructs in the generated
`configure.in'.
* tests/version2.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 8 Jun 2010 18:24:51 +0000 (20:24 +0200)]
Fix botched changelog entry (2010-05-23, Stefano Lattarini)
Stefano Lattarini [Sat, 8 May 2010 01:04:09 +0000 (03:04 +0200)]
Improve declaration of dependencies in the testsuite.
* tests/Makefile.am (check_SCRIPTS): Remove. Instead, let ...
($(TEST_LOGS)): ... all test logs depend on the scripts.
* test/gen-parallel-tests: For each parallel test foo-p.test,
let `foo-p.log' also depend on `foo.test', since it is sourced.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 19:59:37 +0000 (21:59 +0200)]
Merge branch 'perl-coverage'
Ralf Wildenhues [Sun, 6 Jun 2010 19:59:30 +0000 (21:59 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 6 Jun 2010 17:48:52 +0000 (19:48 +0200)]
Coverage for TAGS_DEPENDENCIES warning.
* tests/tags2.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 17:46:11 +0000 (19:46 +0200)]
Coverage for use of anachronistic variables.
* tests/oldvars.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 17:45:16 +0000 (19:45 +0200)]
Testsuite coverage for bogus macro file serial numbers.
* tests/acloca18.test: Also test ill-formed serial numbers
and serial numbers after macro definitions.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 17:44:10 +0000 (19:44 +0200)]
Coverage for aclocal diagnosing underquoted macros.
* tests/acloca23.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 15:02:56 +0000 (17:02 +0200)]
Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
* tests/ldadd.test: Enable errexit. Use AUTOMAKE_fails so
the verbose log contains all output.
* tests/mdate.test: Likewise.
Prompted by Stefano Lattarini's change to discover.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 14:55:08 +0000 (16:55 +0200)]
More minor message fixes.
* aclocal.in (scan_file): Fix recommended info command line.
* automake.in (handle_lib_objects): No need to prepend function
name to prog_error message.
(handle_tags): Add missing word and missing space in error
message.
(handle_dist): Add missing closing single quote in message.
Line-wrap one long message for readability.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 14:40:49 +0000 (16:40 +0200)]
Merge branch 'fix-distcheck'
* fix-distcheck:
Fix distcheck failure with distributed generated parallel tests.
Stefano Lattarini [Thu, 3 Jun 2010 12:04:06 +0000 (14:04 +0200)]
Fix distcheck failure with distributed generated parallel tests.
* tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir)
being different from the value at developer `make dist' time.
* tests/defs.in: Protect against mutiple inclusion, by using ...
($am_defs_included): ... this new variable.
($srcdir): Do not compute, but simply define to `@abs_srcdir@'
as substituted by configure.
Report, suggestions and first fix by Ralf Wildenhues, final
patch by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 12:47:45 +0000 (14:47 +0200)]
Merge branch 'maint'
Stefano Lattarini [Sat, 8 May 2010 00:25:50 +0000 (02:25 +0200)]
Improve tests link*.test (enable `set -e').
* tests/link_c_cxx.test: Enable `errexit shell flag, and related
changes. Also, do not create useless source files.
* tests/link_dist.test: Likewise.
* tests/link_f90_only.test: Likewise.
* tests/link_f_only.test: Likewise.
* tests/link_fc.test: Likewise.
* tests/link_fccxx.test: Likewise.
* tests/link_fcxx.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 12:20:29 +0000 (14:20 +0200)]
Improve ext.test semantics, avoid OpenBSD sh errexit issue.
* tests/ext.test: Inside shell compound command, use
`if $cmd; then Exit 1; fi' rather than `$cmd && Exit 1', to
fix failure with OpenBSD sh introduced with last patch.
Actually ensure that a rule for .EXT.o is created for each
known extension EXT.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Thu, 27 May 2010 05:49:04 +0000 (07:49 +0200)]
Enable `errexit' shell flag in some test scripts.
* tests/dash.test: Enable `errexit' shell flag, and related
changes.
* tests/defun.test: Likewise.
* tests/defun2.test: Likewise.
* tests/dejagnu.test: Likewise.
* tests/double.test: Likewise.
* tests/distcom2.test: Likewise.
* tests/empty2.test: Likewise.
* tests/empty3.test: Likewise.
* tests/empty4.test: Likewise.
* tests/exdir.test: Likewise.
* tests/ext.test: Likewise.
* tests/extra.test: Likewise.
* tests/extra2.test: Likewise.
* tests/extra3.test: Likewise.
* tests/extra4.test: Likewise.
* tests/flibs.test: Likewise.
* tests/fnoc.test: Likewise.
* tests/fo.test: Likewise.
* tests/instexec.test: Likewise.
* tests/ltdeps.test: Likewise.
* tests/nodep.test: Likewise.
* tests/nodepcomp.test: Likewise.
* tests/f90only.test: Likewise, and remove botched/obsoleted
comments and unecessary commands.
* tests/fonly.test: Likewise, and removed botched/obsolted
comments and unecessary commands.
* tests/discover.test: Likewise, and made stricter.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 10:33:32 +0000 (12:33 +0200)]
Enable `errexit' shell flag in all tests cxx*.test.
* tests/cxx.test: Add call to `set -e'. Related changes.
Bumped copyright years.
* tests/cxxansi.test: Likewise.
* tests/cxxcpp.test: Likewise.
* tests/cxxlibobj.test: Likewise.
* tests/cxxlink.test: Likewise.
* tests/cxxo.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 12:33:14 +0000 (14:33 +0200)]
Enable `errexit' shell flag in various tests.
* tests/acoutnoq.test: Enabled `errexit' shell flag, and related
minor changes.
* tests/acoutpt.test: Likewise.
* tests/acoutqnl.test: Likewise.
* tests/amassign.test: Likewise.
* tests/ansi2.test: Likewise.
* tests/ansi4.test: Likewise.
* tests/badprog.test: Likewise.
* tests/checkall.test: Likewise.
* tests/clean.test: Likewise.
* tests/colneq2.test: Likewise.
* tests/colon.test: Likewise.
* tests/colon5.test: Likewise.
* tests/colon6.test: Likewise.
* tests/comment.test: Likewise.
* tests/compile_f90_c_cxx.test: Likewise.
* tests/compile_f_c_cxx.test: Likewise.
* tests/cond3.test: Likewise.
* tests/cond6.test: Likewise.
* tests/cond13.test: Likewise.
* tests/conf2.test: Likewise.
* tests/confvar.test: Likewise.
* tests/confvar2.test: Likewise.
* tests/cond8.test: Likewise, plus a cosmetic change.
* tests/confh4.test: Likewise. Also, add in the heading comments
an excerpt from the original bug report which motivated the
creation of this test, to make its purpose clearer.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 10:45:07 +0000 (12:45 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 6 Jun 2010 10:44:32 +0000 (12:44 +0200)]
Rewrite manual to be gender-neutral.
* doc/automake.texi (GNU Build System)
(Standard Directory Variables, General Operation, CVS)
(Hard-Coded Install Paths, Dependencies As Side Effects):
Rewrite text to not contain gender-specific pronouns when
speaking about developers or users, either by avoiding pronouns
or by addressing them as `you' instead.
* THANKS: Update.
Report by Christina Gratorp.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 10:39:19 +0000 (12:39 +0200)]
Update AUTHORS.
* AUTHORS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 10:24:43 +0000 (12:24 +0200)]
Merge branch 'jk-silent'
* jk-silent:
Tiny fix in silent8.test (display output of `make' command).
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 10:23:39 +0000 (12:23 +0200)]
Merge branch 'maint'
Stefano Lattarini [Tue, 27 Apr 2010 00:06:59 +0000 (02:06 +0200)]
Tiny fix in silent8.test (display output of `make' command).
* tests/silent8.test: Make sure that the captured output of `make'
command is always displayed.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:06:05 +0000 (02:06 +0200)]
Tests on extensibility of silent-rules made stricter.
* tests/silent6.test: Made stricter w.r.t. the grepping of the
output produced by `make'.
* tests/silent7.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:13:15 +0000 (02:13 +0200)]
Tests on silent-mode for C/Libtool made stricter.
* tests/silent.test: Made stricter w.r.t. the grepping of the
output produced by `make'.
* tests/silent2.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent9.test: Likewise.
* tests/silent3.test: Likewise, and add a final `make distclean'
command to keep it better in sync with tests/silent{4,9}.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:12:50 +0000 (02:12 +0200)]
Improved test silent5.test.
* tests/silent5.test: Remove by hand all generated C files after
non-verbose builds, to ensure the following builds are clean.
Try to clean and rebuild with the same verbosity and without
removing generated sources in between, to check that this does
not trigger a different set of rules. Make grepping of make's
output stricter. Improved/added some comments.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:12:21 +0000 (02:12 +0200)]
New tests for Automake silent-mode with Fortran.
* tests/silentf77.test: New test.
* tests/silentf90.test: Likewise.
* tests/Makefile.am (TESTS): Updated accordingly.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:02:54 +0000 (02:02 +0200)]
New test silentcxx.test (Automake/C++ silent-mode).
* tests/silentcxx.test: New test.
* tests/Makefile.am (TESTS): Updated accordingly.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:11:33 +0000 (02:11 +0200)]
New test silentyacc.test (Automake/Yacc silent-mode).
* tests/silentyacc.test: New test.
* tests/Makefile.am (TESTS): Updated accordingly.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 27 Apr 2010 00:11:06 +0000 (02:11 +0200)]
New test silentlex.test (Automake/Lex silent-mode).
* tests/silentlex.test: New test.
* tests/Makefile.am (TESTS): Updated accordingly.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Jun 2010 08:53:03 +0000 (10:53 +0200)]
Merge branch 'je-silent' into maint
* je-silent:
Relax silent-rules tests to cater to verbose makes.
Fix silent-rules output for disabled dependency tracking.
Stefano Lattarini [Tue, 27 Apr 2010 00:10:21 +0000 (02:10 +0200)]
Relax silent-rules tests to cater to verbose makes.
* tests/silent.test: When testing silent builds, don't fail if
make's output simply contains the `mv' substring, but only if
it contains the `mv ' substring (note the trailing space).
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent9.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 23 May 2010 15:22:29 +0000 (17:22 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 23 May 2010 12:44:56 +0000 (14:44 +0200)]
Fix truncated comment in Makefile.am.
* Makefile.am (sc_tests_logs_duplicate_prefixes): Fix unfinished
sentence in comment.
Report by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Mon, 26 Apr 2010 11:58:25 +0000 (13:58 +0200)]
Extend test on `nostdinc' automake option.
* tests/nostdinc.test: Enable `errexit' shell flag. Related and
unrelated minor changes. Make the grepping of the generated
Makefile.in slighty stricter. Generate and run configure, so that
the generated Makefile can be grepped too.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 23 May 2010 13:29:25 +0000 (15:29 +0200)]
Make gnupload portable to EBCDIC hosts.
* lib/gnupload: Use literal newline as argument for 'tr' rather
than \015, for EBCDIC hosts. Also, avoid unportable nested
double-quotes and backquotes.
* THANKS: Update.
Report from Eric Blake and Steve Goetze via gnulib.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 30 Apr 2010 14:52:28 +0000 (16:52 +0200)]
Fix Autoconf version required by Automake's configure.
Automake configure script used to tell that automake required
autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
and if that was not found, it gave an error saying that Automake
required configure 2.61a-341 or later. This change should
eliminate such inconsistencies.
* configure.ac ($required_autoconf_version): New variable.
Use it throughout.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 23 May 2010 12:34:29 +0000 (14:34 +0200)]
Relax silent8.test for NetBSD make.
* tests/silent8.test: Accept ./foo.info in output as well.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 23 May 2010 12:32:39 +0000 (14:32 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 23 May 2010 12:28:05 +0000 (14:28 +0200)]
Fix unportable sed script in maintainer-check test.
* Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
not contain semicolon after 'b' or brace commands, for NetBSD.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 23 May 2010 12:27:32 +0000 (14:27 +0200)]
Wildcards are not portable to NetBSD make.
* doc/automake.texi (Wildcards): Document portability issue.
* tests/extra10.test, tests/extra11.test, tests/extra12.test:
Require GNU make.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 20 Apr 2010 11:26:48 +0000 (13:26 +0200)]
Make test for configure.in vs. configure.ac stricter.
* tests/configure.test: Use a configure.in file that provokes
an automake error, to ensure configure.ac is preferred.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 6 May 2010 01:18:45 +0000 (03:18 +0200)]
Avoid possible false negatives in dejagnu7.test.
* tests/dejagnu7.test: Enable shell `errexit' flag. Also, avoid
unportable use of fgrep option `-e'.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 6 May 2010 16:12:25 +0000 (18:12 +0200)]
Fix conflnk3.test to work with Solaris/Heirloom Sh.
* tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
instead of respectively `test -e FILE' and `test ! -e FILE',
since Solaris Sh doesn't grok the latter. Do not SKIP the test
if the shell doesn't support `test -e'.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 23 May 2010 11:58:44 +0000 (13:58 +0200)]
Fix a ChangeLog commit date, for consistent order.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 8 May 2010 01:20:19 +0000 (03:20 +0200)]
Typofix in ChangeLog entry (2010-04-11, Stefano Lattarini)
Ralf Wildenhues [Sun, 25 Apr 2010 16:26:14 +0000 (18:26 +0200)]
Warning and error message formatting cleanups.
* aclocal.in (parse_arguments, main): Remove trailing period or
newline in error or warning messages, avoid capitalization of
the first word of a message.
* automake.in (check_user_variables, handle_languages)
(handle_ltlibraries, scan_aclocal_m4, scan_autoconf_config_files)
(scan_autoconf_files, cond_stack_if, require_file_internal)
(usage, generate_makefile, parse_arguments): Likewise.
* lib/Automake/ChannelDefs.pm (set_strictness): Likewise.
* lib/Automake/Configure_ac.pm (find_configure_ac): Likewise.
* lib/Automake/Options.pm (set_strictness): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define, variables_dump): Likewise.
* tests/ltinstloc.test, tests/suffix11.test: Adjust expected
error message.
* lib/Automake/Channels.pm (setup_channel): Reword error message
to be the same as in msg.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 16:44:53 +0000 (18:44 +0200)]
Fix placing of ellipses in English text and synopses.
* Makefile.am: Be sure to add a space before `...' in natural
language text.
* automake.in (scan_autoconf_traces): Likewise.
* lib/Automake/Rule.pm (define): Likewise.
* lib/Automake/Variable.pm (define): Likewise.
* lib/am/dejagnu.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/gnupload (dprint, upload): Likewise.
* tests/confdeps.test: Likewise.
* tests/location.test: Adjust expected output.
* automake.in (usage): In synopsis, use singular for OPTION,
* remove space before ellipsis.
* aclocal.in (usage): Likewise. Also, fix indentation.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 16:44:41 +0000 (18:44 +0200)]
Fix more duplicate message prefixes.
* lib/Automake/XFile.pm (seek): Do not prepend $me.
($me): Remove now-unused package-global.
* aclocal.in (check_acinclude): Remove duplicate 'warning: '
prefix.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 16:49:18 +0000 (18:49 +0200)]
Merge branch 'maint' into foo
Ralf Wildenhues [Sun, 25 Apr 2010 15:19:54 +0000 (17:19 +0200)]
Fix typo in manual.
* doc/automake.texi (Simple Tests using parallel-tests): Add
missing closing parenthesis.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 15:19:13 +0000 (17:19 +0200)]
Fix leftover call to removed function macros_dump.
* automake.in (read_main_am_file): Call variables_dump, not
macros_dump. Print actual error before list of variables.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 22 Apr 2010 20:34:29 +0000 (22:34 +0200)]
Minor improvements in comments of silent3.test.
* tests/silent3.test: Tell to keep it in sync with `silent9.test'
too.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 25 Apr 2010 09:42:23 +0000 (11:42 +0200)]
testsuite: ensure verbose printing of captured output.
* tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
tests/fort2.test, tests/help.test, tests/missing3.test,
tests/missing6.test: Print captured stdout or stderr before
grepping it.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 15:40:02 +0000 (17:40 +0200)]
Make badopt.test stricter (by enabling `set -e').
* tests/badopt.test: Add call to `set -e'. Due to this change,
an unexpected failure in the call to `$ACLOCAL' (whose outcome
was previously unchecked) would cause the whole test to fail.
Also, bumped the copyright years.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 20 Apr 2010 19:02:15 +0000 (21:02 +0200)]
Make test for configure.in vs. configure.ac stricter.
* tests/configure.test: Use a configure.in file that provokes
an automake error, to ensure configure.ac is preferred.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 9 Apr 2010 16:24:34 +0000 (18:24 +0200)]
Use `set -e' in confsub.test (avoid false negatives).
* tests/confsub.test: Enable shell `errexit' flag, and related
changes (this helps avoiding some possible minor false negatives).
Also, bumped copyright years.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 20 Apr 2010 09:26:28 +0000 (11:26 +0200)]
Typofix in older changelog entry.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 20 Apr 2010 05:47:11 +0000 (07:47 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Tue, 20 Apr 2010 05:43:59 +0000 (07:43 +0200)]
Fix -Werror handling for presence of configure.in and configure.ac.
* lib/Automake/Variable.pm (Automake::Variable): Do not initialize
$configure_ac at the global level, before command-line arguments
have been parsed.
(require_variables): Initialize it here.
* tests/configure.test: New test.
* tests/Makefile.am: Update.
Report by Stefano Lattarini.
Stefano Lattarini [Fri, 9 Apr 2010 14:33:43 +0000 (16:33 +0200)]
Avoid possible false negatives in confh5.test.
* tests/confh5.test: Enable shell `errexit' flag, and bumped
copyright years. Due to this change, any unexpected failure
in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
a failure in grepping expected text in output files should now
cause the whole test to fail.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 17 Apr 2010 13:51:11 +0000 (15:51 +0200)]
Fix botched ChangeLog entry.
Stefano Lattarini [Sat, 17 Apr 2010 13:40:35 +0000 (15:40 +0200)]
Fix typo in POD documentation of Automake::Channels.
* lib/Automake/Channels.pm: Fixed typo in POD documentation:
@<...> was used instead of C<...>.
Stefano Lattarini [Wed, 14 Apr 2010 11:52:51 +0000 (13:52 +0200)]
Refactor tests on Automake TESTS color output.
* tests/color.test: Tests using the expect program moved out to...
* tests/color2.test: ... this new file.
* tests/Makefile.am (TESTS): Extended accordingly.
Stefano Lattarini [Sun, 11 Apr 2010 20:34:18 +0000 (22:34 +0200)]
Fix typos in comments in test confh5.test
* tests/confh5.test: Fix a couple of typos in comments.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 16:30:29 +0000 (18:30 +0200)]
Avoid possible false negatives in canon-name.test.
* tests/canon-name.test: Enable shell `errexit' flag. Improve
test description.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 20:00:09 +0000 (22:00 +0200)]
Print 'warnings are treated as errors' note if needed.
* lib/Automake/Channels.pm: Fix typo in comment.
(_print_message): If -Werror is enabled, print a 'warnings are
treated as errors' note before the first such warning.
* tests/warnopts.test: Adjust comment to mention expected warning.
Adjust code to ignore 'warnings are treated as errors' note.
* tests/location.test: Adjust expected output with -Werror.
* tests/werror4.test: New test.
* tests/Makefile.am: Update.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 19:30:34 +0000 (21:30 +0200)]
Ensure we don't print 'warning:' or 'error:' twice.
* Makefile.am (sc_ensure_testsuite_has_run): New helper rule.
(sc_tests_logs_duplicate_prefixes): New rule, to check for
wrong-looking warning and error messages in the test suite logs.
* aclocal.in (scan_configure_dep, scan_file): Remove duplicate
`warning: ' prefix.
* tests/vars3.test: Rename variable to avoid false positive.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 19:04:13 +0000 (21:04 +0200)]
Prepend type to warning, error, and fatal messages.
For the first part of messages of types `error' or `fatal',
prepend `error: ' to the message. Prepend `warning: ' to
warning messages, whatever the setting of -Werror.
* lib/Automake/Channels.pm (partial): Move up definition.
(_format_message): Emit `header' and `footer' strings only with
the first resp. last part of a set of partial messages.
* lib/Automake/ChannelDefs.pm: Add missing '1;' statement at the
end of the module.
(Automake::ChannelDefs): Setup warning channels with header
`warning: ', error and fatal messages with header `error: '.
* tests/condinc2.test, tests/ltinstloc.test: Adjust expected
error messages.
* tests/comment5.test: Likewise. Also, include stack notes
should not start with `error:'.
* tests/location.test: Likewise. Also, try both -Werror and
-Wno-error.
* NEWS: Update.
Report by Bruno Haible.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 18:49:38 +0000 (20:49 +0200)]
Fix capitalization of error messages, reword one message.
* lib/Automake/Variable.pm (define): Do not capitalize the first
word in the error message.
* automake.in (require_file_internal): Likewise. Also, reword
and line-wrap for better readability.
* tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
Adjust tests.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 18:31:19 +0000 (20:31 +0200)]
Fix connected warnings about obsolete exeext override.
* lib/Automake/Rule.pm (define): Merge two warnings that belong
together, by setting the 'partial' flag for the first one.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 18:04:01 +0000 (20:04 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 11 Apr 2010 17:56:21 +0000 (19:56 +0200)]
Fix per-Makefile.am setting of -Werror.
Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
Makefile.am would carry over to other Makefile.am files
treated afterwards by the same thread, causing inconsistent
and unstable exit status values.
* lib/Automake/Channels.pm (dup_channel_setup)
(drop_channel_setup): Save and restore the setting of
$warnings_are_errors.
* tests/werror3.test: New test.
* tests/Makefile.am: Adjust.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 11 Apr 2010 17:53:35 +0000 (19:53 +0200)]
Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh.
* tests/confh5.test: In the generated Makefile.am: do not use
`test ! -e FILE' to check for the non-existence of a file, since
that is not supported by Solarish/Heirloom Sh.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 23:27:23 +0000 (01:27 +0200)]
Avoid possible false negatives in cond46.test.
* tests/cond46.test: Enable shell `errexit' flag (and bumped
copyright years). Due to this change, the testcase should now
fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
outcomes were previously unchecked), and on failures in grepping
the expected diagnostic in Automake stderr.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Apr 2010 08:54:16 +0000 (10:54 +0200)]
Make test `aclocal3.test' stricter.
* tests/aclocal3.test: Add call to `set -e'. Fail if $ACLOCAL
succeds unexpectedly.
Make test `aclocal3.test' stricter.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Wed, 31 Mar 2010 21:41:01 +0000 (23:41 +0200)]
Check that symlinks are resolved by `make dist'.
* tests/distlinks.test: New test.
* tests/Makefile.am (TESTS): Updated accordingly.
Suggested by observations from Ralf Wildenhues.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Apr 2010 17:43:20 +0000 (19:43 +0200)]
Use -9 for maximum xz compression with dist-xz.
* lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
* NEWS, THANKS: Update.
Report by Pavel Sanda.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 7 Mar 2010 14:48:10 +0000 (15:48 +0100)]
Generated tests are now just a thin layer around other tests.
* tests/Makefile.am: Rewrite the rule to generate the `*-p.test'
test scripts so that any of them simply includes the corresponding
`*.test' script (after setting `$parallel_tests' to `yes').
* tests/.gitignore: Add wildcard for temporary files used in the
generation of `*-p.test' tests.
Ralf Wildenhues [Sun, 4 Apr 2010 06:44:53 +0000 (08:44 +0200)]
Merge branch 'maint'
Stefano Lattarini [Tue, 30 Mar 2010 15:36:13 +0000 (17:36 +0200)]
Avoid an unportable use of `$status' shell variable.
* Makefile.am (path-check): Don't use the `$status' shell variable
in the target's rules, as it's special in Zsh (equivalent to `$?',
and readonly).
Stefano Lattarini [Tue, 30 Mar 2010 15:12:27 +0000 (17:12 +0200)]
Avoid another use of `chmod -R'.
* Makefile.am (path-check): To be safe, do not use `chmod -R' on
$(distdir) before removing it (as Solaris `chmod -R' touches
symlink targets). Instead, use the cleanup strategy used in
distdir.am (which is also employed in tests/defs.in).
Ralf Wildenhues [Sun, 28 Mar 2010 16:06:22 +0000 (18:06 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 28 Mar 2010 15:56:50 +0000 (17:56 +0200)]
Remove uses of @acronym and @sc.
* doc/automake.texi (Public Macros, Limitations on File Names):
Remove all usage of @acronym and @sc in the manual.
Suggested by Karl Berry.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Sat, 13 Mar 2010 11:18:54 +0000 (12:18 +0100)]
GNU hello uses fdl.texi, not gpl.texi.
* doc/automake.texi (Texinfo): Adjust example to upstream
change.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 13 Mar 2010 10:42:17 +0000 (11:42 +0100)]
Fix ChangeLog entry.
Ralf Wildenhues [Sat, 6 Mar 2010 08:35:46 +0000 (09:35 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 6 Mar 2010 08:14:06 +0000 (09:14 +0100)]
Formatting cleanups in macro comments.
* automake.in, lib/Automake/Channels.pm,
lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
lib/Automake/Variable.pm, lib/Automake/XFile.pm,
m4/options.m4, m4/substnot.m4: Fix macro comment format.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Fri, 5 Mar 2010 20:29:38 +0000 (21:29 +0100)]
Merge branch 'maint'
Stefano Lattarini [Thu, 4 Mar 2010 19:22:17 +0000 (20:22 +0100)]
Avoid generation of `tests/defs-p' file
* tests/defs.in: In the generated `configure.in' snippet: call
`AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell
variable `parallel_tests' is set to `yes'.
* tests/Makefile.am (defs-p): Target removed.
(check_SCRIPTS): Removed `defs-p'.
(clean-local-check): Do not unlink `defs-p' anymore.
($(parallel_tests)): Transformation rules for the test scripts
adjusted.
* tests/gen-parallel-tests: Selection rules for the test
scripts adjusted.
* tests/parallel-tests.test: Set `$parallel_tests' to `yes'
then include `./defs' (rather than simply including `./defs-p').
* tests/parallel-tests2.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/parallel-tests4.test: Likewise.
* tests/parallel-tests5.test: Likewise.
* tests/parallel-tests6.test: Likewise.
* tests/parallel-tests7.test: Likewise.
* tests/parallel-tests8.test: Likewise.
* tests/parallel-tests9.test: Likewise.
* tests/parallel-tests10.test: Likewise.
* tests/README (Section "Writing Test Cases", subsection "Do"):
Adjusted the parts referring to tests checking `parallel-tests'
behaviour. Some other minor related improvements.
* tests/.gitignore (defs-p): Removed.
Stefano Lattarini [Thu, 4 Mar 2010 20:09:13 +0000 (21:09 +0100)]
Remove redundant unset of variable TESTS from some test scripts.
* tests/color.test: Do not unset the `TESTS' variable, as it's
already unset in the `defs' file.
* tests/check5.test: Likewise.
* tests/check8.test: Likewise.
* tests/check9.test: Likewise.
* tests/check10.test: Likewise.
* tests/check11.test: Likewise.
* tests/parallel-tests.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/parallel-tests4.test: Likewise.
* tests/parallel-tests5.test: Likewise.
* tests/parallel-tests6.test: Likewise.
* tests/parallel-tests7.test: Likewise.
Stefano Lattarini [Thu, 4 Mar 2010 02:32:35 +0000 (03:32 +0100)]
Fix typo in ChangeLog entry.
projects / platform / upstream / automake.git / log