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.
Ralf Wildenhues [Mon, 1 Mar 2010 19:43:25 +0000 (20:43 +0100)]
Fix cscope test on systems without working Fortran compiler.
* tests/cscope.test: Skip remainder of test if `$MAKE all' fails.
* THANKS: Update.
Report by Peter Johansson.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Wed, 24 Feb 2010 18:56:26 +0000 (19:56 +0100)]
Merge branch 'lzip-support'
* lzip-support:
Add lzip compression support.
Antonio Diaz Diaz [Wed, 24 Feb 2010 18:41:59 +0000 (19:41 +0100)]
Add lzip compression support.
* automake.in (handle_dist): Recognize dist-lzip.
(make_paragraphs): Map LZIP to dist-lzip.
* doc/automake.texi (Dist): Add dist-lzip.
(Options): Likewise.
* lib/Automake/Options.pm (_process_option_list): Add dist-lzip.
* lib/am/distdir.am
(dist dist-all): Add command to create an lzip-compressed tarball.
(distcheck): Handle lzip-compressed tarballs just like the others.
* tests/defs.in: Test for lzip, too.
* tests/lzip.test: New file, based on nogzip.test.
* tests/Makefile.am (TESTS): Add lzip.test.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 22 Feb 2010 21:16:34 +0000 (22:16 +0100)]
Merge branch 'maint'
Karl Berry [Mon, 22 Feb 2010 21:08:43 +0000 (22:08 +0100)]
Improve help message of mdate-sh.
* mdate-sh: mention actual output format in help message.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 22 Feb 2010 17:53:51 +0000 (18:53 +0100)]
Deprecate dist-lzma in favor of dist-xz.
* doc/automake.texi (The Types of Distributions, Options):
Adjust text to reflect renaming of lzma to xz.
* NEWS: Update.
Missing deprecation noted by Antonio Diaz Diaz.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sat, 20 Feb 2010 16:38:19 +0000 (17:38 +0100)]
Add tests about support of wildcards in EXTRA_DIST.
* tests/extra10.test: New test, check basic support of wildcards
in EXTRA_DIST.
* tests/extra11.test: New test, check more complex usage of
wildcards in EXTRA_DIST.
* tests/extra11.test: New test, check usage of wildcards in
EXTRA_DIST when $builddir != $srcdir.
* tests/Makefile.am (TESTS): Updated accordingly.
Necessity of these new tests suggested by Braden McDaniel
and Ralf Wildenhues.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 8 Feb 2010 06:33:03 +0000 (07:33 +0100)]
Merge branch 'maint'
Simon Josefsson [Mon, 8 Feb 2010 06:32:20 +0000 (07:32 +0100)]
Fix copyright statement in gnupload script.
* lib/gnupload: Fix copyright statement.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 6 Feb 2010 19:48:26 +0000 (20:48 +0100)]
Merge branch 'maint'
Dmitry V. Levin [Sat, 30 Jan 2010 19:21:19 +0000 (22:21 +0300)]
Fix exit status of signal handlers in shell scripts.
The value of `$?' on entrance to signal handlers in shell scripts
cannot be relied upon, so set the exit code explicitly to
128 + SIG<SIGNAL>.
* lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
* lib/elisp-comp: Likewise.
* lib/install-sh: Likewise.
* lib/ylwrap: Likewise. Also, fix script to trap signal 13, not 3.
* NEWS, THANKS: Update.
Bug report, analysis, and initial patch by Dmitry V. Levin.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Sat, 6 Feb 2010 17:27:55 +0000 (18:27 +0100)]
Improve gnupload usage text.
* gnupload (usage): Shorten to make more likely to fit on a tty
line. Mention CMD in the synopsis. With ..., plural is implied.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 6 Feb 2010 17:21:52 +0000 (18:21 +0100)]
Use --email with gendocs.sh.
* HACKING: Set bug reporting address in gendocs.sh command.
Christos Kontas [Sat, 23 Jan 2010 21:23:08 +0000 (23:23 +0200)]
Fix some typos in the manual
* doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 24 Jan 2010 11:37:36 +0000 (12:37 +0100)]
Merge branch 'je-silent'
* je-silent:
Fix silent-rules output for disabled dependency tracking.
Ralf Wildenhues [Sun, 24 Jan 2010 11:36:47 +0000 (12:36 +0100)]
Fix silent-rules output for disabled dependency tracking.
* lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
expansion code to also work in the case where %AMDEP% expands
to FALSE at config.status time, using new substitution string
%VERBOSE-NODEP%.
* automake.in (verbose_nodep_flag): New function, appending
`@am__nodep@' to the verbose-variable name.
(handle_languages): If dependencies are not disabled, use it to
set %VERBOSE-NODEP%.
* m4/depend.m4: Substitute am__nodep as '_no', so the second
verbose-variable will always expand to an empty string, if
dependencies are enabled.
* tests/silent5.test: Also test --disable-dependency-tracking;
also test per-target flags for non-C language files.
* tests/silent9.test: New test, like silent4.test but disable
dependency tracking.
* tests/Makefile.am: Adjust.
* NEWS, THANKS: Update.
Report by Dmitry V. Levin <ldv@altlinux.org>.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 13:22:56 +0000 (14:22 +0100)]
Merge branch 'maint'
Stefano Lattarini [Sun, 17 Jan 2010 13:20:15 +0000 (14:20 +0100)]
Slighty improve tests acoutbs.test and acoutbs2.test.
* tests/acoutbs2.test: Enable `errexit' shell flag. Check that
autoconf and configure work, that the file `zot' is created by
configure, and that no file containing a backslash in its name is
created.
* tests/acoutbs.test: Likewise, plus updated copyright years.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 17 Jan 2010 13:18:39 +0000 (14:18 +0100)]
Fix test acoutbs2.test.
* tests/acoutbs2: In the generated configure.in: add proper calls
to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
PACKAGE and VERSION. Add a call to aclocal before calling automake.
Updated copyright years.
* tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 17 Jan 2010 13:15:15 +0000 (14:15 +0100)]
Add forgotten test scripts to $(TESTS).
* tests/Makefile.am (TESTS): Added test scripts present on the
filesystem, which were erroneously left out from $(TESTS):
acoutbs2.test, badopt.test, extra2.test.
(XFAIL_TESTS): Added acoutbs2.test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 12:48:16 +0000 (13:48 +0100)]
Sync auxiliary files from upstream.
* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
Sync from upstream.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 11:08:50 +0000 (12:08 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 17 Jan 2010 11:08:19 +0000 (12:08 +0100)]
Bump copyright years.
* aclocal.in (write_aclocal, version): Bump copyright years.
* automake.in (gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 11:06:44 +0000 (12:06 +0100)]
Merge branch 'maint'
* maint:
Rotate ChangeLog.
This is a faked merge, to ensure that the ChangeLog.09 file
represents the contents from master, not from maint.
Ralf Wildenhues [Sun, 17 Jan 2010 11:03:48 +0000 (12:03 +0100)]
Rotate ChangeLog.
* ChangeLog.09: New file, rotated from ...
* ChangeLog: ... here.
* Makefile.am (EXTRA_DIST): Distribute ChangeLog.09.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 17 Jan 2010 10:30:57 +0000 (11:30 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Tue, 29 Dec 2009 18:42:41 +0000 (19:42 +0100)]
Fix and complete copyright notices in Makefile.am files.
* Makefile.am: Use single-`#' comment for copyright notice, so
that it also appears in the generated Makefile.in file.
* doc/Makefile.am: Likewise.
* doc/amhello/Makefile.am: Likewise.
* doc/amhello/src/Makefile.am: Likewise.
* lib/Automake/Makefile.am: Likewise.
* lib/Automake/tests/Makefile.am: Likewise.
* lib/Makefile.am: Likewise.
* lib/am/Makefile.am: Likewise.
* m4/Makefile.am: Likewise.
* tests/Makefile.am: Add copyright notice.
Report of missing copyright notice by Stefano Lattarini.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Sun, 27 Dec 2009 14:52:38 +0000 (15:52 +0100)]
Fixed typo in Makefile.am (extra semicolon removed)
* Makefile.am (sc_diff_automake_in_automake): Removed an extra
semicolon in target's rules, which prevented a stdout redirection
from working.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 21 Dec 2009 21:24:37 +0000 (22:24 +0100)]
Merge branch 'maint'
Julien Danjou [Mon, 21 Dec 2009 21:24:02 +0000 (22:24 +0100)]
Add support for newer python version
* m4/python.m4 (AM_PATH_PYTHON): Add python3.1 to
_AM_PYTHON_INTERPRETER_LIST.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Karl Berry [Mon, 21 Dec 2009 21:22:31 +0000 (22:22 +0100)]
mention ncftpput in gnupload --help
* lib/gnupload: Mention ncftpput in `--help' output.
Report by Bruce Korb.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 6 Dec 2009 15:25:04 +0000 (16:25 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 6 Dec 2009 15:23:47 +0000 (16:23 +0100)]
Update NEWS.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 14:11:07 +0000 (15:11 +0100)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 5 Dec 2009 14:10:11 +0000 (15:10 +0100)]
Regenerate files with Autoconf 2.65.
Antonio Diaz Diaz [Sat, 5 Dec 2009 13:45:30 +0000 (14:45 +0100)]
Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
* lib/am/distdir.am (distcheck): Use lzma -d, gzip -d, bzip2 -d,
instead of the respective un$tool invocation, to avoid depending
on another tool.
* THANKS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 13:39:15 +0000 (14:39 +0100)]
Use $DJDIR rather than $DJGPP to detect running on DJGPP.
* automake.in (Language): Use $ENV{'DJDIR'} for the
$ENV{'SHELL'} override.
* bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
bootstrapping under MinGW when $DJGPP has been set.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 13:28:58 +0000 (14:28 +0100)]
Merge branch 'jk-silent'
* jk-silent:
Fix requirements of silent8.test.
Ralf Wildenhues [Sat, 5 Dec 2009 13:28:20 +0000 (14:28 +0100)]
Fix requirements of silent8.test.
* tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o,
dvips.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 5 Dec 2009 13:13:43 +0000 (14:13 +0100)]
Do not rely on Perl symlink status, for MSYS perl.
* automake.in (require_file_internal): Ensure presence of
symlink target file; MSYS perl symlink doesn't return an error
status when the file could not be created (copied, on this
system). Fixes symlink.test failure.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 4 Dec 2009 14:47:23 +0000 (15:47 +0100)]
Avoid Solaris sh `set -e' bug in vala4.test.
* tests/vala4.test: New variable $cwd, holding the full path of the
current directory. Use it instead of `pwd` command substitution,
to avoid Heirloom/Solaris Sh bug with `set -e'.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 4 Dec 2009 17:15:57 +0000 (18:15 +0100)]
Remove executable bit from automake.in
File `automake.in' is not meant to be executed (only to be
preprocessed into `automake'), so don't leave it executable.
* automake.in: Remove executable bit.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Fri, 4 Dec 2009 17:40:50 +0000 (18:40 +0100)]
Don't make the generated Automake's Config.pm executable.
* lib/Automake/Makefile.am (Config.pm): Don't make the generated
`Config.pm' file executable.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Mon, 30 Nov 2009 21:38:23 +0000 (22:38 +0100)]
Merge branch 'maint'
Jim Meyering [Sat, 28 Nov 2009 20:05:33 +0000 (21:05 +0100)]
do not put world-writable directories in distribution tarballs
* lib/am/distdir.am (distdir): Do not make all directories
group- or world-writable. Instead, use 755.
* tests/subpkg4.test (test-distdir-is-readable): Check for new,
more restricted permissions.
Ralf Wildenhues [Sun, 29 Nov 2009 21:27:48 +0000 (22:27 +0100)]
Merge branch 'maint'
Karl Berry [Sun, 29 Nov 2009 20:48:13 +0000 (21:48 +0100)]
Rewrite `gnupload --help' examples.
* lib/gnupload: Use GNU style version numbers, a generic package
name, and more useful examples.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Jim Meyering [Sun, 29 Nov 2009 19:35:03 +0000 (20:35 +0100)]
avoid a warning from perl-5.11
* lib/Automake/Wrap.pm (_tab_length): Remove useless use of tr's
"/d" modifier.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 15 Nov 2009 19:32:29 +0000 (20:32 +0100)]
Merge branch 'perl-coverage'
* perl-coverage:
Coverage for corner cases in derive_suffix.
Coverage for user-provided _LINK variables.
Coverage: warn about substitutions that need EXTRA_PRIMARY.
Coverage: warn about configure substitution in EXTRA_PRIMARY.
Coverage for syntax errors with conditionals in included fragments.
Coverage: diagnose variables with forbidden dist_ prefix.
Coverage for conditional `else' and `endif' arguments.
Ralf Wildenhues [Sat, 14 Nov 2009 20:58:34 +0000 (21:58 +0100)]
Coverage for corner cases in derive_suffix.
Ensure unrelatex SUFFIXES entries and unrelated inference rules
are ignored silently.
* tests/ext3.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:58:01 +0000 (21:58 +0100)]
Coverage for user-provided _LINK variables.
* tests/link_override.test: New test.
* tests/Makefile.am: Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:57:37 +0000 (21:57 +0100)]
Coverage: warn about substitutions that need EXTRA_PRIMARY.
* tests/extra9.test: New test.
* tests/Makefile.am: Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:57:11 +0000 (21:57 +0100)]
Coverage: warn about configure substitution in EXTRA_PRIMARY.
* tests/subst5.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:56:49 +0000 (21:56 +0100)]
Coverage for syntax errors with conditionals in included fragments.
* tests/condinc2.test: Amend test.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:56:15 +0000 (21:56 +0100)]
Coverage: diagnose variables with forbidden dist_ prefix.
* tests/candist.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 20:52:34 +0000 (21:52 +0100)]
Coverage for conditional `else' and `endif' arguments.
* tests/cond46.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 14 Nov 2009 13:05:38 +0000 (14:05 +0100)]
Distribute the Automake bootstrap script.
* Makefile.am (EXTRA_DIST): Add bootstrap.
Report by Jan Engelhardt.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 1 Nov 2009 13:39:21 +0000 (14:39 +0100)]
Merge branch 'maint'
Jim Meyering [Sat, 31 Oct 2009 16:47:58 +0000 (17:47 +0100)]
Don't let an envvar setting of "$fail" cause build failure.
Without this change, in a project using an automake-generated
Makefile, "make fail=anything" would fail inappropriately,
due to the `test -z "$$fail"' at the end of this emitted rule:
* lib/am/subdirs.am ($(RECURSIVE_TARGETS)): Initialize "fail=" to keep
an envvar setting of that variable from causing unwarranted failure.
($(RECURSIVE_CLEAN_TARGETS)): Likewise.
* tests/subdir10.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 15:38:55 +0000 (17:38 +0200)]
Merge branch 'perl-coverage'
* perl-coverage:
Simplify Variable::_check_ambiguous_condition.
Coverage for DisjConditions.pm.
Coverage and fixes for Condition.pm.
Coverage for Wrap.pm.
Coverage for Version.pm.
Pod coverage for Perl modules.
Ralf Wildenhues [Sun, 18 Oct 2009 10:05:43 +0000 (12:05 +0200)]
Simplify Variable::_check_ambiguous_condition.
* lib/Automake/Variable.pm (_check_ambiguous_condition): No need
to check for $def since ambiguous_p returns an empty $message if
there is no other condition which is ambiguous to $cond.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 10:03:29 +0000 (12:03 +0200)]
Coverage for DisjConditions.pm.
* lib/Automake/tests/DisjConditions.pl (test_basics): Increase
test coverage: test ->human, ->merge, ->simplify, ->multiply.
* lib/Automake/tests/DisjConditions-t.pl (test_basics): Likewise
changes, but including state copies across thread creation.
* lib/Automake/tests/DisjCon2.pl: New test.
* lib/Automake/tests/DisjCon3.pl: Likewise.
* lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Adjust.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 10:01:46 +0000 (12:01 +0200)]
Coverage and fixes for Condition.pm.
* lib/Automake/Condition.pm (new): Catch common programming
errors better by checking type of passed argument before
munging them to all be strings through split.
* lib/Automake/tests/Condition.pl (test_basics): Also test
->human.
(test_merge): New function, test ->merge, ->merge_conds,
->strip.
* lib/Automake/tests/Condition-t.pl (test_basics, test_merge):
Likewise changes, but including state copies across thread
creation.
* lib/Automake/tests/Cond2.pl: New test for programming error.
* lib/Automake/tests/Cond3.pl: Likewise.
* lib/Automake/tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 09:55:10 +0000 (11:55 +0200)]
Coverage for Wrap.pm.
* lib/Automake/tests/Wrap.pl (@tests): Add test for word with
trailing space.
(test_makefile_wrap, @makefile_tests): New function, new list of
tests, to test makefile_wrap.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 09:46:14 +0000 (11:46 +0200)]
Coverage for Version.pm.
* lib/Automake/tests/Version.pl (test_version_compare): Also
try Automake::Version::check for the version pairs, taking into
account the special-case naming of code forks.
(@tests): Add more test cases.
(test_bad_versions, @bad_versions): New function, new test cases,
to ensure bad version strings are rejected.
* lib/Automake/tests/Version2.pl: New test.
* lib/Automake/tests/Version3.pl: Likewise.
* lib/Automake/tests/Makefile.am (TESTS): Add tests here ...
(XFAIL_TESTS): ... and here, new.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 08:00:28 +0000 (10:00 +0200)]
Pod coverage for Perl modules.
* lib/Automake/ChannelDefs.pm (parse_warnings): Fix
typo in Pod documentation.
* lib/Automake/Condition.pm: Add a couple of missing `=back'
lines.
(_has): Renamed from ...
(has): ... this, as this is an internal method.
(strip, false, true_when): Adjust callers.
* lib/Automake/Configure_ac.pm: Add Pod `Functions' section with
documentation for find_configure_ac and require_configure_ac.
* lib/Automake/Location.pm: Fix typo in Pod. Add `Methods'
section, document methods.
* lib/Automake/RuleDef.pm: New `Methods' Pod section.
* lib/Automake/VarDef.pm: Document `raw_value'.
* lib/Automake/Wrap.pm (_tab_length): Rename from ...
(tab_length): ... this, as this is an internal method.
(wrap): Adjust callers.
* lib/Automake/XFile.pm: Reorganize Pod a bit, add `Methods'
section.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 18 Oct 2009 09:19:03 +0000 (11:19 +0200)]
Merge branch 'perl-coverage'
* perl-coverage:
Perl coverage support using Devel::Cover.
Add convenience `recheck' target to our toplevel Makefile.am.
Ralf Wildenhues [Sat, 17 Oct 2009 16:14:33 +0000 (18:14 +0200)]
Perl coverage support using Devel::Cover.
This introduces makefile rules to run the testsuite with Perl
coverage enabled. It skips tests that use perl ithreads, by
unsetting AUTOMAKE_JOBS and setting WANT_NO_THREADS to make the
threaded tests skip.
* Makefile.am (PERL_COVERAGE_DB, PERL_COVERAGE_FLAGS)
(PERL_COVER): New variables.
(check-coverage, recheck-coverage, clean-coverage): New phony
targets.
(check-coverage-run, recheck-coverage-run): New phony helper
targets.
(clean-local): New, depend on clean-coverage.
* lib/Automake/tests/Condition-t.pl: Skip if WANT_NO_THREADS is
set.
* lib/Automake/tests/DisjConditions-t.pl: Likewise.
* tests/defs.in: New required entry 'perl-threads'.
* tests/parallel-am.test: Use it to skip if WANT_NO_THREADS is
set.
* tests/parallel-am2.test: Likewise.
* tests/parallel-am3.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 17 Oct 2009 13:18:27 +0000 (15:18 +0200)]
Add convenience `recheck' target to our toplevel Makefile.am.
* Makefile.am (recheck): New convenience target.
* tests/README: Give examples for running only failed or
outdated or otherwise selected tests.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 17 Oct 2009 08:28:16 +0000 (10:28 +0200)]
Merge branch 'parallel-dist'
* parallel-dist:
dist: allow running several compressors in parallel.
Ralf Wildenhues [Sat, 17 Oct 2009 08:27:17 +0000 (10:27 +0200)]
Merge branch 'dr-cscope'
* dr-cscope:
Fix license headers of cscope tests to be GPLv2+.
Ralf Wildenhues [Sat, 17 Oct 2009 08:23:54 +0000 (10:23 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sat, 17 Oct 2009 08:18:45 +0000 (10:18 +0200)]
Sync auxiliary files from upstream.
* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
lib/texinfo.tex: Sync from upstream.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 17 Oct 2009 08:15:18 +0000 (10:15 +0200)]
Doc and comment typos.
* automake.in (handle_ltlibraries): Fix typo in comment.
* tests/distcom7.test: Likewise.
* tests/lisp5.test: Likewise.
* doc/automake.texi (Usage of Conditionals): Fix typo.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 17 Oct 2009 08:10:44 +0000 (10:10 +0200)]
Fix license headers of cscope tests to be GPLv2+.
* tests/cscope.test: Revert to GPL version 2.
* tests/cscope2.test: Likewise.
* tests/cscope3.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sat, 17 Oct 2009 06:00:02 +0000 (08:00 +0200)]
dist: allow running several compressors in parallel.
* lib/am/distdir.am (am__post_remove_distdir): New internal
variable.
(DIST_TARGETS): New variable, set to list of chosen distribution
formats. Order formats by expected duration, slowest first, for
better parallelism.
(dist-gzip, dist-bzip2, dist-lzma, dist-xz, dist-tarZ)
(dist-shar, dist-zip): Use $(am__post_remove_distdir).
(dist, dist-all): Do not depend on distdir. Instead of
replicating each compression command, use a recursive invocation
to allow running all $(DIST_TARGETS) in parallel.
* NEWS: Update.
Report by Peter Breitenlohner.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Oct 2009 14:58:27 +0000 (16:58 +0200)]
Fix race condition in werror2.test due to sanity sleep change.
* tests/werror2.test: Generate Makefile.in before configure so
that a Makefile.am update after configure has run is guaranteed
to be newer than Makefile.in.
* tests/subdir5.test: Document why this test does not need to be
fixed.
* tests/subdir8.test: Likewise.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Oct 2009 11:47:15 +0000 (13:47 +0200)]
Merge branch 'maint'
Ralf Wildenhues [Sun, 11 Oct 2009 11:44:37 +0000 (13:44 +0200)]
Improve description of the various *LINK variables.
* doc/automake.texi (Program and Library Variables): _LINK also
receives libraries to link against. _LINK may be generated.
(Program Variables): Document reasons when per-target _LINK is
used instead of LINK.
(How the Linker is Chosen): Document how a per-target _LINK
variable and per-target link flags override linker selection.
* THANKS: Update.
Report by Dave Korn against gcc/libstdc++-v3.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Oct 2009 11:33:43 +0000 (13:33 +0200)]
Allow variable override of, rather than by, silent variables.
When overriding variables, check the VAR_SILENT status of the
old condition, not the new one: we allow non-silent overrides
of silent variables (these do not hit ordering bugs in the
automake output), but there is no use case for doing so the
other way round. Fixes conditional overrides of variables
annotated AM_SUBST_NOTMAKE in configure.ac.
* lib/Automake/Variable.pm (_check_ambiguous_condition): Check
for VAR_SILENT in $ambig_cond not $cond.
* tests/cond44.test, tests/cond45.test: New tests, analogous to
cond23.test and cond24.test.
* tests/Makefile.am: Update.
Spotted originally in binutils/bfd.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Oct 2009 11:28:31 +0000 (13:28 +0200)]
Fix `make clean check' for the Automake package.
* lib/Automake/Makefile.am (SUBDIRS): Add `.' before `tests',
so that Config.pm is built first.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Sun, 11 Oct 2009 11:23:11 +0000 (13:23 +0200)]
Fix in-tree `recheck' after failed test that runs `check'.
If a test like pr401b-p.test fails for some reason, a `make
recheck' would cause another reason for failure because it sets
AM_MAKEFLAGS which gets propagated into the test and causes its
`make check' to fail.
* tests/defs.in: Also unset AM_MAKEFLAGS.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Oct 2009 20:57:26 +0000 (22:57 +0200)]
Updated code enabling Bourne-compatibility in test scripts.
* tests/defs.in: updated the code enabling Bourne-compatibility
mode in the shell (now it's copied from autoconf 2.64).
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Thu, 8 Oct 2009 20:42:13 +0000 (22:42 +0200)]
Avoid leaking TEST_LOG_COMPILER in environment of test scripts.
* tests/defs.in: Unset variable `TEST_LOG_COMPILER'.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Stefano Lattarini [Tue, 6 Oct 2009 15:01:23 +0000 (17:01 +0200)]
Testsuite: do not use `chmod -R' when cleaning up.
* tests/Makefile.am (clean-local-check): Do not use `chmod -R' on
the test directories, as that may change or try to change the mode
of installed files: the test directory may contain symlinks to
ltmain.sh files from a Libtool installation, and Solaris `chmod -R'
touches symlink targets. Instead, use the cleanup strategy used
in distdir.am (which is also employed in tests/defs.in).
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues [Tue, 6 Oct 2009 20:09:37 +0000 (22:09 +0200)]
Merge branch 'maint'
projects / platform / upstream / automake.git / log