[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-2
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-245-g4afce93 |
|
Date: |
Fri, 18 May 2012 11:32:51 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=4afce93badb93dd22be31d3f373962ad0af43fbc
The branch, ng/master has been updated
via 4afce93badb93dd22be31d3f373962ad0af43fbc (commit)
via 0c2b92f2a9395a0bd4d2a858445025e1bd59be93 (commit)
via 80bf8f9a788913adedfde4e1d9a0c00cf1e01605 (commit)
via b681094d2886991c8fa1ca7a3721ee0e1b3c1fa3 (commit)
via a13efca93cb8c238aa6dbc7f566baa3e8826b8ed (commit)
via 75e655e9d9f871d7a716612f4a1e753f13f99dac (commit)
via 906bc7c9b7a78669e9f35aa68cd23b5bf9540a83 (commit)
via c259affdefcd7857788811f4480727c5202d500c (commit)
via 0010655c826446ed1be07874138830a37fb8a6bf (commit)
via 8df5284d9b3abf09df2251ffe344fc535b017379 (commit)
via 3579ab0e2f8fb4afd324215b7b007c769f74d106 (commit)
via c71a0053fe5d73777f47d8682411f844afe33973 (commit)
via 02f42e6e18ff489d0374c693fd1c3c45b6d78ddd (commit)
via 8a2df0d1fe3c865a391ab2c88ca9c14c0be57c89 (commit)
via 9c0400ed8aae7fda77ecacd2d51771a7692dd16e (commit)
via 362ec502ba89831cc3b74e09946a80e9bf848419 (commit)
via 8c01ea77d45fc0d36479845659701f4e673ddea4 (commit)
via f11ef5c676fc6fad78a5cb54855789c6d0e47238 (commit)
via a8f56923e0adc291c0b1cdd556fda17645d3b9f1 (commit)
via 12711fcc0f3dc914b7e63345a25a186b8d4e401f (commit)
from 8d899acbab58dd806deda03862d64cbafff2cb6a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4afce93badb93dd22be31d3f373962ad0af43fbc
Merge: 0c2b92f c259aff
Author: Stefano Lattarini <address@hidden>
Date: Fri May 18 11:57:18 2012 +0200
Merge branch 'ng/parallel-tests' into ng/master
* ng/parallel-tests:
[ng] perf: optimize 'am__strip_suffixes' for speed
[ng] check: memoize some internal vars (avoid useless recalculation)
[ng] check: per-suffix dependencies for test cases
[ng] check: few minor simplifications
[ng] tests: remove overly picky test cases (and fix few typos)
[ng] check: AM_LAZY_CHECK="yes", not RECHECK_TESTS="", for lazy re-runs
[ng] check: refactor: split recipes for check-TESTS and recheck
[ng] check: minor refactoring (prefer make time over recipe time)
[ng] check: minor refactoring (reorder code)
[ng] check: refactor (better names for internal vars)
[ng] check: refactoring to reduce code duplication
[ng] refactor: get rid of am__EXEEXT (automake conditional and %transform)
[ng] check: big refactoring with semantic changes in parallel-tests
support
commit 0c2b92f2a9395a0bd4d2a858445025e1bd59be93
Merge: b681094 80bf8f9
Author: Stefano Lattarini <address@hidden>
Date: Fri May 18 11:53:49 2012 +0200
Merge branch 'ng/doc' into ng/master
* ng/doc:
[ng] docs: adjusted outdated make output in an example
[ng] doc: get rid of automake-history.texi
[ng] doc: rename automake.texi -> automake-ng.texi
[ng] doc: reference "Automake-NG" rather than "Automake" in few places
commit 80bf8f9a788913adedfde4e1d9a0c00cf1e01605
Author: Stefano Lattarini <address@hidden>
Date: Fri May 18 11:52:26 2012 +0200
[ng] docs: adjusted outdated make output in an example
* doc/automake-ng.texi (Built Sources Example): Fix the expected make
output not to report hand-rolled VPATH rewriting that automake-generated
rules do not perform anymore. Modernize the output from gcc as well.
Signed-off-by: Stefano Lattarini <address@hidden>
commit b681094d2886991c8fa1ca7a3721ee0e1b3c1fa3
Author: Stefano Lattarini <address@hidden>
Date: Fri May 18 11:24:55 2012 +0200
[ng] texinfo: simplify VPATH handling
GNU make doesn't do VPATH rewrites a' la' Solaris make, but does VPATH
rewrites for the '$<' automatic variable. Take advantage of these facts
to simplify some texinfo-related recipes.
It is worth nothing that with this change, Automake-generated texinfo
rules will assume Texinfo >= 4.1. Since that is more than 10 years old,
this new requirement should be perfectly acceptable.
* lib/am/texi-vers.am, lib/am/texibuild.am: Simplify some rules by
assuming Texinfo >= 4.1 and GNU make VPATH semantics.
Signed-off-by: Stefano Lattarini <address@hidden>
commit a13efca93cb8c238aa6dbc7f566baa3e8826b8ed
Author: Stefano Lattarini <address@hidden>
Date: Thu May 17 12:32:16 2012 +0200
[ng] doc: get rid of automake-history.texi
* doc/automake-history.texi: Remove, it's already maintained as a part
of mainline Automake.
* Makefile.am (info_TEXINFOS): Adjust.
(doc_automake_history_TEXINFOS): Remove.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 75e655e9d9f871d7a716612f4a1e753f13f99dac
Author: Stefano Lattarini <address@hidden>
Date: Thu May 17 12:23:08 2012 +0200
[ng] doc: rename automake.texi -> automake-ng.texi
* doc/automake.texi: Renamed ...
* doc/automake-ng.texi: ... to this.
* Makefile.am (info_TEXINFOS): Adjust.
(doc_automake_TEXINFOS): Renamed ...
(doc_automake_ng_TEXINFOS): ... to this.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 906bc7c9b7a78669e9f35aa68cd23b5bf9540a83
Author: Stefano Lattarini <address@hidden>
Date: Thu May 17 12:14:13 2012 +0200
[ng] doc: reference "Automake-NG" rather than "Automake" in few places
We only do the change in few key places, which are the most relevant
and visible ones, and which ar also very unlikely to change. We do
not do the Automake -> Automake-NG substitution throughout, because
we don't want to cause extra conflicts or inconsistency when merging
changes from the 'master' branch into 'ng/master'.
* doc/automake.texi: Reference "Automake-NG" rather than "Automake" in
few key places, to minimize the possibility of confusing the user.
In particular, do so in the '@top', '@setfilename' and '@settitle'
declarations, in the "front-cover", and in the introduction.
(PACKAGE_BUGREPORT): Redefine to 'address@hidden' rather than
to 'address@hidden'.
(Reporting Bugs): A bug reported to 'address@hidden' will not
cause anymore an issue to be opened automatically in the Automake
bug tracker; account for this.
Remove any reference to the old Automake Gnats database.
Adjust the list of authors, adding Ralf Wildenhues and myself (Stefano
Lattarini).
* doc/amhello/README: Adjust to match what is reported in the manual.
Signed-off-by: Stefano Lattarini <address@hidden>
commit c259affdefcd7857788811f4480727c5202d500c
Author: Stefano Lattarini <address@hidden>
Date: Wed May 16 14:51:24 2012 +0200
[ng] perf: optimize 'am__strip_suffixes' for speed
This optimization offers some noticeable performance improvements for
packages having a lot of tests and using the Automake-provided parallel
testsuite harness; this is due to the fact that the internal automake
variable 'am__test_bases' used by it is calculated through a proper call
to 'am__strip_suffixes'.
More precisely, we have measured the times required to complete null
"make all", "make recheck" and "make check AM_LAZY_CHECK=yes"
invocations in a package with 5000 tests in the top-level directory
and other 5000 tests in a subdirectory. Here are the results,
averaged on a several runs:
+ Before this patch:
- "make all" 2.7 seconds
- "make recheck" 3.9 seconds
- "make check AM_LAZY_CHECK=yes" 15.2 seconds
+ After this patch:
- "make all" 0.4 seconds
- "make recheck" 1.7 seconds
- "make check AM_LAZY_CHECK=yes" 7.2 seconds
+ In mainline automake (commit v1.12-75-gd89da9c):
- "make all" 0.9 seconds
- "make recheck" 3.5 seconds
- "make check RECHECK_LOGS=" 14.1 seconds
See also previous commit v1.12-233-g0010655 "[ng] check: memoize some
internal vars (avoid useless recalculation)" for another (weaker)
optimization.
The need for this optimization has been suggested by Bob Friesenhahn:
<http://lists.gnu.org/archive/html/automake-ng/2012-05/msg00045.html>
* lib/am/header-vars.am (am__strip_suffixes): Rewrite in a way
that allows much better performance.
(am__private_suffix): New internal variable, used by the new
implementation.
(am__strip_suffixes): Remove, it's not needed anymore.
* t/internals.tap: Adjust.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 5 +-
NG-NEWS | 28 +
automake.in | 38 +-
defs | 2 +-
doc/amhello/README | 1 +
doc/automake-history.texi | 1214 --------------------
doc/{automake.texi => automake-ng.texi} | 237 ++--
lib/am/check.am | 148 +--
lib/am/check2.am | 62 +-
lib/am/header-vars.am | 20 +
lib/am/texi-vers.am | 3 +-
lib/am/texibuild.am | 18 +-
m4/init.m4 | 15 +-
syntax-checks.mk | 35 +-
t/README | 2 +-
t/check-concurrency-bug9245.sh | 2 +-
t/color2.sh | 2 +-
t/internals.tap | 41 +-
t/parallel-tests-cmdline-override.sh | 84 --
t/parallel-tests-concatenated-suffix.sh | 76 ++
t/parallel-tests-dynamic.sh | 21 +-
...y-testlogs.sh => parallel-tests-empty-tests.sh} | 9 +-
t/parallel-tests-exeext.sh | 18 +-
t/parallel-tests-extra-programs.sh | 4 +-
t/parallel-tests-fork-bomb.sh | 3 +-
t/parallel-tests-log-override-2.sh | 86 --
t/parallel-tests-log-override-recheck.sh | 99 --
...verride-1.sh => parallel-tests-log-override.sh} | 0
...xample.sh => parallel-tests-logvars-example.sh} | 17 +-
t/parallel-tests-longest-stem.sh | 1 -
t/parallel-tests-no-spurious-summary.sh | 68 --
t/parallel-tests-per-suffix-deps.sh | 163 +++
t/parallel-tests.sh | 32 +-
t/parallel-tests6.sh | 1 +
t/serial-tests.sh | 4 +-
t/tap-basic.sh | 6 +-
t/tap-deps.sh | 2 +-
t/{tap-recheck-logs.sh => tap-lazy-check.sh} | 24 +-
t/tap-no-spurious-summary.sh | 47 -
t/tap-todo-skip.sh | 2 +-
t/test-driver-custom-multitest-recheck2.sh | 28 +-
t/test-missing.sh | 6 +-
t/test-trs-basic.sh | 18 +-
t/test-trs-recover.sh | 6 +-
44 files changed, 688 insertions(+), 2010 deletions(-)
delete mode 100644 doc/automake-history.texi
rename doc/{automake.texi => automake-ng.texi} (98%)
delete mode 100755 t/parallel-tests-cmdline-override.sh
create mode 100755 t/parallel-tests-concatenated-suffix.sh
rename t/{parallel-tests-empty-testlogs.sh => parallel-tests-empty-tests.sh}
(90%)
delete mode 100755 t/parallel-tests-log-override-2.sh
delete mode 100755 t/parallel-tests-log-override-recheck.sh
rename t/{parallel-tests-log-override-1.sh => parallel-tests-log-override.sh}
(100%)
rename t/{parallel-tests-log-compiler-example.sh =>
parallel-tests-logvars-example.sh} (87%)
delete mode 100755 t/parallel-tests-no-spurious-summary.sh
create mode 100755 t/parallel-tests-per-suffix-deps.sh
rename t/{tap-recheck-logs.sh => tap-lazy-check.sh} (77%)
delete mode 100755 t/tap-no-spurious-summary.sh
diff --git a/Makefile.am b/Makefile.am
index b37e2e7..1000764 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -483,9 +483,8 @@ clean-local-check:
## Documentation. ##
## ---------------- ##
-info_TEXINFOS = doc/automake.texi doc/automake-history.texi
-doc_automake_TEXINFOS = doc/fdl.texi
-doc_automake_history_TEXINFOS = doc/fdl.texi
+info_TEXINFOS = doc/automake-ng.texi
+doc_automake_ng_TEXINFOS = doc/fdl.texi
man1_MANS = \
doc/aclocal.1 \
diff --git a/NG-NEWS b/NG-NEWS
index 49c16ea..4eab948 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -99,6 +99,34 @@ Parallel testsuite harness
work as expected:
TESTS = $(wildcard $(srcdir)/t[0-9][0-9]*.sh)
+* It is not anymore possible to override TEST_LOGS at make runtime as a
+ mean to redefine the list of tests to be run.
+
+ # This won't work anymore!
+ make check TESTS_LOGS="foo.log bar.log baz.log"
+
+ But it's still possible do so overriding TESTS at make runtime; and
+ in this case (as was the case for TEST_LOGS overriding), it is not
+ necessary to specify the extensions of the tests to be run:
+
+ # This will work even if complete names of the tests are (say)
+ # "foo.test", "bar.test$(EXEEXT)" and "baz$(EXEEXT)".
+ make check TESTS="foo bar baz"
+
+* The use of 'RECHECK_LOGS' is not supported anymore. Thus, to lazily
+ re-run only the tests whose '.trs' or '.log' files are out-of-date,
+ one must now use:
+
+ make check AM_LAZY_CHECK=yes # New valid API.
+
+ instead of:
+
+ make check RECHECK_LOGS="" # Old API, won't work anymore.
+
+* Per-suffix dependencies for test cases can be specified through
+ variables "<ext>_LOG_DEPENDENCIES" (this being simply "LOG_DEPENDENCIES"
+ for suffix-less tests).
+
Pattern rules and suffix rules
==============================
diff --git a/automake.in b/automake.in
index 11d1f0b..7cf488d 100644
--- a/automake.in
+++ b/automake.in
@@ -4642,7 +4642,7 @@ sub handle_tests_dejagnu
sub handle_per_suffix_test($)
{
my $test_suffix = shift;
- my ($pfx, $parallel_tests_option, $am_exeext);
+ my ($pfx, $parallel_tests_option);
prog_error ("called with 'parallel-tests' option not set")
unless $parallel_tests_option = option 'parallel-tests';
if ($test_suffix eq '')
@@ -4655,8 +4655,6 @@ sub handle_per_suffix_test($)
unless $test_suffix =~ m/^\.(.*)/;
$pfx = uc ($1) . '_';
}
- $am_exeext = exists $configure_vars{'EXEEXT'} ? 'am__EXEEXT'
- : 'FALSE';
# The "test driver" program, deputed to handle tests protocol used by
# test scripts. By default, it's assumed that no protocol is used,
# so we fall back to the old "parallel-tests" behaviour, implemented
@@ -4669,10 +4667,13 @@ sub handle_per_suffix_test($)
"\$(SHELL) $am_config_aux_dir/test-driver",
INTERNAL);
}
+ # Required to avoid spurious errors like:
+ # ``variable 'LOG_DEPENDENCIES' is defined but no program or
+ # library has 'LOG' as canonical name (possible typo)''
+ set_seen ("${pfx}LOG_DEPENDENCIES");
$output_rules .= file_contents ('check2', new Automake::Location,
PFX => $pfx,
- EXT => $test_suffix,
- am__EXEEXT => $am_exeext);
+ EXT => $test_suffix);
}
# is_valid_test_extension ($EXT)
@@ -4708,11 +4709,10 @@ sub handle_tests
if (var ('TESTS'))
{
push (@check_tests, 'check-TESTS');
- my $check_deps = "@check";
$output_rules .= &file_contents ('check', new Automake::Location,
COLOR => !! option 'color-tests',
PARALLEL_TESTS => !! option
'parallel-tests',
- CHECK_DEPS => $check_deps);
+ CHECK_DEPS => "@check");
if (my $parallel_tests = option 'parallel-tests')
{
@@ -4743,30 +4743,12 @@ sub handle_tests
# an explicit 'all' target) rather than from the 'all.test' script,
# thus causing all sort of mishaps and confusion.
push @test_suffixes, '';
-
- define_variable ('am__test_logs1',
- '$(patsubst %,%.log,$(strip $(am__cooked_tests)))',
- INTERNAL);
- my $nhelper = 1;
foreach my $test_suffix (@test_suffixes)
{
handle_per_suffix_test ($test_suffix);
- my @cooked_test_suffixes = ($test_suffix);
- push @cooked_test_suffixes, ($test_suffix . '$(EXEEXT)')
- if exists $configure_vars{'EXEEXT'};
- foreach my $cooked_test_suffix (@cooked_test_suffixes)
- {
- my $old_var = 'am__test_logs' . $nhelper++;
- my $cur_var = 'am__test_logs' . $nhelper;
- define_variable (
- $cur_var,
- "\$($old_var:$cooked_test_suffix.log=.log)",
- INTERNAL);
- }
}
- define_variable ('TEST_LOGS', "\$(am__test_logs$nhelper)", INTERNAL);
- $clean_files{'$(TEST_LOGS)'} = MOSTLY_CLEAN;
- $clean_files{'$(TEST_LOGS:.log=.trs)'} = MOSTLY_CLEAN;
+ $clean_files{'$(am__test_logs)'} = MOSTLY_CLEAN;
+ $clean_files{'$(am__test_results)'} = MOSTLY_CLEAN;
$clean_files{'$(TEST_SUITE_LOG)'} = MOSTLY_CLEAN;
}
else
@@ -6753,6 +6735,8 @@ sub preprocess_file ($%)
'LIBTOOL' => !! var ('LIBTOOL'),
'NONLIBTOOL' => 1,
+ 'HANDLE-EXEEXT' => (exists $configure_vars{'EXEEXT'} ?
+ 'TRUE' : 'FALSE'),
%transform);
if (! defined ($_ = $am_file_cache{$file}))
diff --git a/defs b/defs
index 36f298c..32b60b6 100644
--- a/defs
+++ b/defs
@@ -162,11 +162,11 @@ unset srcdir
unset TESTS_ENVIRONMENT AM_TESTS_ENVIRONMENT
unset DISABLE_HARD_ERRORS
unset AM_COLOR_TESTS
+unset AM_LAZY_CHECK
unset TESTS
unset XFAIL_TESTS
unset TEST_LOGS
unset TEST_SUITE_LOG
-unset RECHECK_LOGS
unset VERBOSE
for pfx in TEST_ SH_ TAP_ ''; do
unset ${pfx}LOG_COMPILER
diff --git a/doc/amhello/README b/doc/amhello/README
index 4a3daf6..d1b8e03 100644
--- a/doc/amhello/README
+++ b/doc/amhello/README
@@ -1 +1,2 @@
This is a demonstration package for GNU Automake-NG.
+Type 'info Automake-NG' to read its manual.
diff --git a/doc/automake-history.texi b/doc/automake-history.texi
deleted file mode 100644
index 5cb3685..0000000
--- a/doc/automake-history.texi
+++ /dev/null
@@ -1,1214 +0,0 @@
-\input texinfo @c -*-texinfo-*-
address@hidden %**start of header
address@hidden automake-history.info
address@hidden automake-history
address@hidden on
address@hidden %**end of header
-
address@hidden
-
-This manual describes (part of) the history of GNU Automake, a program
-that creates GNU standards-compliant Makefiles from template files.
-
-Copyright @copyright{} 1995-2012 Free Software Foundation, Inc.
-
address@hidden
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License,
-Version 1.3 or any later version published by the Free Software
-Foundation; with no Invariant Sections, with no Front-Cover texts,
-and with no Back-Cover Texts. A copy of the license is included in the
-section entitled ``GNU Free Documentation License.''
-
address@hidden quotation
address@hidden copying
-
address@hidden
address@hidden Brief History of Automake
address@hidden David MacKenzie
address@hidden Tom Tromey
address@hidden Alexandre Duret-Lutz
address@hidden
address@hidden 0pt plus 1filll
address@hidden
address@hidden titlepage
-
address@hidden
-
address@hidden
address@hidden Top
address@hidden node-name, next, previous, up
address@hidden Brief History of Automake
-
address@hidden
-
address@hidden
-* Timeline:: The Automake story.
-* Dependency Tracking Evolution:: Evolution of Automatic Dependency Tracking
-* Releases:: Release statistics
-* Copying This Manual:: How to make copies of this manual
-
address@hidden
- --- The Detailed Node Listing ---
-
-Evolution of Automatic Dependency Tracking
-
-* First Take on Dependencies:: Precomputed dependency tracking
-* Dependencies As Side Effects:: Update at developer compile time
-* Dependencies for the User:: Update at user compile time
-* Techniques for Dependencies:: Alternative approaches
-
-Techniques for Computing Dependencies
-
-* Recommendations for Tool Writers::
-* Future Directions for Dependencies::
-
-Copying This Manual
-
-* GNU Free Documentation License:: License for copying this manual
-
address@hidden detailmenu
address@hidden menu
-
address@hidden ifnottex
-
address@hidden Timeline
address@hidden Timeline
-
address@hidden @asis
address@hidden 1994-09-19 First CVS commit.
-
-If we can trust the CVS repository, David address@hidden (djm) started
-working on Automake (or AutoMake, as it was spelt then) this Monday.
-
-The first version of the @command{automake} script looks as follows.
-
address@hidden
-#!/bin/sh
-
-status=0
-
-for makefile
-do
- if test ! -f address@hidden@}.am; then
- echo "automake: address@hidden@}.am: No such honkin' file"
- status=1
- continue
- fi
-
- exec 4> address@hidden@}.in
-
-done
address@hidden example
-
-From this you can already see that Automake will be about reading
address@hidden file and producing @file{*.in} files. You cannot see
-anything else, but if you also know that David is the one who created
-Autoconf two years before you can guess the rest.
-
-Several commits follow, and by the end of the day Automake is
-reported to work for GNU fileutils and GNU m4.
-
-The modus operandi is the one that is still used today: variable
-assignments in @file{Makefile.am} files trigger injections of
-precanned @file{Makefile} fragments into the generated
address@hidden The use of @file{Makefile} fragments was inspired
-by the 4.4BSD @command{make} and include files, however Automake aims
-to be portable and to conform to the GNU standards for @file{Makefile}
-variables and targets.
-
-At this point, the most recent release of Autoconf is version 1.11,
-and David is preparing to release Autoconf 2.0 in late October. As a
-matter of fact, he will barely touch Automake after September.
-
address@hidden 1994-11-05 David MacKenzie's last commit.
-
-At this point Automake is a 200 line portable shell script, plus 332
-lines of @file{Makefile} fragments. In the @file{README}, David
-states his ambivalence between ``portable shell'' and ``more
-appropriate language'':
-
address@hidden
-I wrote it keeping in mind the possibility of it becoming an Autoconf
-macro, so it would run at configure-time. That would slow
-configuration down a bit, but allow users to modify the Makefile.am
-without needing to fetch the AutoMake package. And, the Makefile.in
-files wouldn't need to be distributed. But all of AutoMake would. So
-I might reimplement AutoMake in Perl, m4, or some other more
-appropriate language.
address@hidden quotation
-
-Automake is described as ``an experimental Makefile generator''.
-There is no documentation. Adventurous users are referred to the
-examples and patches needed to use Automake with GNU m4 1.3, fileutils
-3.9, time 1.6, and development versions of find and indent.
-
-These examples seem to have been lost. However at the time of writing
-(10 years later in September, 2004) the FSF still distributes a
-package that uses this version of Automake: check out GNU termutils
-2.0.
-
address@hidden 1995-11-12 Tom Tromey's first commit.
-
-After one year of inactivity, Tom Tromey takes over the package.
-Tom was working on GNU cpio back then, and doing this just for fun,
-having trouble finding a project to contribute to. So while hacking
-he wanted to bring the @file{Makefile.in} up to GNU standards. This
-was hard, and one day he saw Automake on @url{ftp://alpha.gnu.org/},
-grabbed it and tried it out.
-
-Tom didn't talk to djm about it until later, just to make sure he
-didn't mind if he made a release. He did a bunch of early releases to
-the Gnits folks.
-
-Gnits was (and still is) totally informal, just a few GNU friends who
-Fran@,cois Pinard knew, who were all interested in making a common
-infrastructure for GNU projects, and shared a similar outlook on how
-to do it. So they were able to make some progress. It came along
-with Autoconf and extensions thereof, and then Automake from David and
-Tom (who were both gnitsians). One of their ideas was to write a
-document paralleling the GNU standards, that was more strict in some
-ways and more detailed. They never finished the GNITS standards, but
-the ideas mostly made their way into Automake.
-
address@hidden 1995-11-23 Automake 0.20
-
-Besides introducing automatic dependency tracking (@pxref{Dependency
-Tracking Evolution}), this version also supplies a 9-page manual.
-
-At this time @command{aclocal} and @code{AM_INIT_AUTOMAKE} did not
-exist, so many things had to be done by hand. For instance, here is
-what a configure.in (this is the former name of the
address@hidden we use today) must contain in order to use
-Automake 0.20:
-
address@hidden
-PACKAGE=cpio
-VERSION=2.3.911
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
address@hidden example
-
-(Today all of the above is achieved by @code{AC_INIT} and
address@hidden)
-
-Here is how programs are specified in @file{Makefile.am}:
-
address@hidden
-PROGRAMS = hello
-hello_SOURCES = hello.c
address@hidden example
-
-This looks pretty much like what we do today, except the
address@hidden variable has no directory prefix specifying where
address@hidden should be installed: all programs are installed in
address@hidden(bindir)}. @code{LIBPROGRAMS} can be used to specify programs
-that must be built but not installed (it is called
address@hidden nowadays).
-
-Programs can be built conditionally using @code{AC_SUBST}itutions:
-
address@hidden
-PROGRAMS = @@progs@@
-AM_PROGRAMS = foo bar baz
address@hidden example
-
-(@code{AM_PROGRAMS} has since then been renamed to
address@hidden)
-
-Similarly scripts, static libraries, and data can be built and installed
-using the @code{LIBRARIES}, @code{SCRIPTS}, and @code{DATA} variables.
-However @code{LIBRARIES} were treated a bit specially in that Automake
-did automatically supply the @file{lib} and @file{.a} prefixes.
-Therefore to build @file{libcpio.a}, one had to write
-
address@hidden
-LIBRARIES = cpio
-cpio_SOURCES = ...
address@hidden example
-
-Extra files to distribute must be listed in @code{DIST_OTHER} (the
-ancestor of @code{EXTRA_DIST}). Also extra directories that are to be
-distributed should appear in @code{DIST_SUBDIRS}, but the manual
-describes this as a temporary ugly hack (today extra directories should
-also be listed in @code{EXTRA_DIST}, and @code{DIST_SUBDIRS} is used
-for another purpose, @pxref{Conditional Subdirectories, , Conditional
-Subdirectories, automake, GNU Automake}).
-
address@hidden 1995-11-26 Automake 0.21
-
-In less time than it takes to cook a frozen pizza, Tom rewrites
-Automake using Perl. At this time Perl 5 is only one year old, and
-Perl 4.036 is in use at many sites. Supporting several Perl versions
-has been a source of problems through the whole history of Automake.
-
-If you never used Perl 4, imagine Perl 5 without objects, without
address@hidden variables (only dynamically scoped @samp{local} variables),
-without function prototypes, with function calls that needs to be
-prefixed with @samp{&}, etc. Traces of this old style can still be
-found in today's @command{automake}.
-
address@hidden 1995-11-28 Automake 0.22
address@hidden 1995-11-29 Automake 0.23
-
-Bug fixes.
-
address@hidden 1995-12-08 Automake 0.24
address@hidden 1995-12-10 Automake 0.25
-
-Releases are raining. 0.24 introduces the uniform naming scheme we
-use today, i.e., @code{bin_PROGRAMS} instead of @code{PROGRAMS},
address@hidden instead of @code{LIBLIBRARIES}, etc. (However
address@hidden does not exist yet, @code{AM_PROGRAMS} is still
-in use; and @code{TEXINFOS} and @code{MANS} still have no directory
-prefixes.) Adding support for prefixes like that was one of the major
-ideas in @command{automake}; it has lasted pretty well.
-
-AutoMake is renamed to Automake (Tom seems to recall it was Fran@,cois
-Pinard's doing).
-
-0.25 fixes a Perl 4 portability bug.
-
address@hidden 1995-12-18 Jim Meyering starts using Automake in GNU Textutils.
address@hidden 1995-12-31 Fran@,cois Pinard starts using Automake in GNU tar.
-
address@hidden 1996-01-03 Automake 0.26
address@hidden 1996-01-03 Automake 0.27
-
-Of the many changes and suggestions sent by Fran@,cois Pinard and
-included in 0.26, perhaps the most important is the advice that to
-ease customization a user rule or variable definition should always
-override an Automake rule or definition.
-
-Gordon Matzigkeit and Jim Meyering are two other early contributors
-that have been sending fixes.
-
-0.27 fixes yet another Perl 4 portability bug.
-
address@hidden 1996-01-13 Automake 0.28
-
-Automake starts scanning @file{configure.in} for @code{LIBOBJS}
-support. This is an important step because until this version
-Automake only knew about the @file{Makefile.am}s it processed.
address@hidden was Autoconf's world and the link between Autoconf
-and Automake had to be done by the @file{Makefile.am} author. For
-instance, if @file{config.h} was generated by @file{configure}, it was the
-package maintainer's responsibility to define the @code{CONFIG_HEADER}
-variable in each @file{Makefile.am}.
-
-Succeeding releases will rely more and more on scanning
address@hidden to better automate the Autoconf integration.
-
-0.28 also introduces the @code{AUTOMAKE_OPTIONS} variable and the
address@hidden and @option{--gnits} options, the latter being stricter.
-
address@hidden 1996-02-07 Automake 0.29
-
-Thanks to @file{configure.in} scanning, @code{CONFIG_HEADER} is gone,
-and rebuild rules for @file{configure}-generated file are
-automatically output.
-
address@hidden and @code{MANS} converted to the uniform naming
-scheme.
-
address@hidden 1996-02-24 Automake 0.30
-
-The test suite is born. It contains 9 tests. From now on test cases
-will be added pretty regularly (@pxref{Releases}), and this proved to
-be really helpful later on.
-
address@hidden finally replaces @code{AM_PROGRAMS}.
-
-All the third-party Autoconf macros, written mostly by Fran@,cois
-Pinard (and later Jim Meyering), are distributed in Automake's
-hand-written @file{aclocal.m4} file. Package maintainers are expected
-to extract the necessary macros from this file. (In previous versions
-you had to copy and paste them from the manual...)
-
address@hidden 1996-03-11 Automake 0.31
-
-The test suite in 0.30 was run via a long @code{check-local} rule. Upon
-Ulrich Drepper's suggestion, 0.31 makes it an Automake rule output
-whenever the @code{TESTS} variable is defined.
-
address@hidden is renamed to @code{EXTRA_DIST}, and the @code{check_}
-prefix is introduced. The syntax is now the same as today.
-
address@hidden 1996-03-15 Gordon Matzigkeit starts writing libtool.
-
address@hidden 1996-04-27 Automake 0.32
-
address@hidden targets are introduced; an idea from Dieter Baron.
-
address@hidden files, which were output in the build directory are
-now built in the source directory, because they are distributed. It
-seems these files like to move back and forth as that will happen
-again in future versions.
-
address@hidden 1996-05-18 Automake 0.33
-
-Gord Matzigkeit's main two contributions:
-
address@hidden
address@hidden very preliminary libtool support
address@hidden the distcheck rule
address@hidden itemize
-
-Although they were very basic at this point, these are probably
-among the top features for Automake today.
-
-Jim Meyering also provides the infamous @code{jm_MAINTAINER_MODE}, since
-then renamed to @code{AM_MAINTAINER_MODE} and abandoned by its author
-(@pxref{maintainer-mode, , maintainer-mode, automake, GNU Automake}).
-
address@hidden 1996-05-28 Automake 1.0
-
-After only six months of heavy development, the @command{automake} script is
-3134 lines long, plus 973 lines of @file{Makefile} fragments. The
-package has 30 pages of documentation, and 38 test cases.
address@hidden contains 4 macros.
-
-From now on and until version 1.4, new releases will occur at a rate
-of about one a year. 1.1 did not exist, actually 1.1b to 1.1p have
-been the name of beta releases for 1.2. This is the first time
-Automake uses suffix letters to designate beta releases, a habit that
-lasts.
-
address@hidden 1996-10-10 Kevin Dalley packages Automake 1.0 for Debian
GNU/Linux.
-
address@hidden 1996-11-26 David address@hidden releases Autoconf 2.12.
-
-Between June and October, the Autoconf development is almost stalled.
-Roland McGrath has been working at the beginning of the year. David
-comes back in November to release 2.12, but he won't touch Autoconf
-anymore after this year, and Autoconf then really stagnates. The
-desolate Autoconf @file{ChangeLog} for 1997 lists only 7 commits.
-
address@hidden 1997-02-28 @email{automake@@gnu.ai.mit.edu} list alive
-
-The mailing list is announced as follows:
address@hidden
-I've created the "automake" mailing list. It is
-"automake@@gnu.ai.mit.edu". Administrivia, as always, to
-automake-request@@gnu.ai.mit.edu.
-
-The charter of this list is discussion of automake, autoconf, and
-other configuration/portability tools (e.g., libtool). It is expected
-that discussion will range from pleas for help all the way up to
-patches.
-
-This list is archived on the FSF machines. Offhand I don't know if
-you can get the archive without an account there.
-
-This list is open to anybody who wants to join. Tell all your
-friends!
--- Tom Tromey
address@hidden smallexample
-
-Before that people were discussing Automake privately, on the Gnits
-mailing list (which is not public either), and less frequently on
address@hidden
-
address@hidden is now @code{gnu.org}, in case you never
-noticed. The archives of the early years of the
address@hidden@@gnu.org} list have been lost, so today it is almost
-impossible to find traces of discussions that occurred before 1999.
-This has been annoying more than once, as such discussions can be
-useful to understand the rationale behind a piece of uncommented code
-that was introduced back then.
-
address@hidden 1997-06-22 Automake 1.2
-
-Automake developments continues, and more and more new Autoconf macros
-are required. Distributing them in @file{aclocal.m4} and requiring
-people to browse this file to extract the relevant macros becomes
-uncomfortable. Ideally, some of them should be contributed to
-Autoconf so that they can be used directly, however Autoconf is
-currently inactive. Automake 1.2 consequently introduces
address@hidden (@command{aclocal} was actually started on
-1996-07-28), a tool that automatically constructs an @file{aclocal.m4}
-file from a repository of third-party macros. Because Autoconf has
-stalled, Automake also becomes a kind of repository for such
-third-party macros, even macros completely unrelated to Automake (for
-instance macros that fix broken Autoconf macros).
-
-The 1.2 release contains 20 macros, including the
address@hidden macro that simplifies the creation of
address@hidden
-
-Libtool is fully supported using @code{*_LTLIBRARIES}.
-
-The missing script is introduced by Fran@,cois Pinard; it is meant
-to be a better solution than @code{AM_MAINTAINER_MODE}
-(@pxref{maintainer-mode, , maintainer-mode, automake, GNU Automake}).
-
-Conditionals support was implemented by Ian Lance Taylor. At the
-time, Tom and Ian were working on an internal project at Cygnus. They
-were using ILU, which is pretty similar to address@hidden They wanted to
-integrate ILU into their build, which was all @file{configure}-based,
-and Ian thought that adding conditionals to @command{automake} was
-simpler than doing all the work in @file{configure} (which was the
-standard at the time). So this was actually funded by Cygnus.
-
-This very useful but tricky feature will take a lot of time to
-stabilize. (At the time this text is written, there are still
-primaries that have not been updated to support conditional
-definitions in Automake 1.9.)
-
-The @command{automake} script has almost doubled: 6089 lines of Perl,
-plus 1294 lines of @file{Makefile} fragments.
-
address@hidden 1997-07-08 Gordon Matzigkeit releases Libtool 1.0.
-
address@hidden 1998-04-05 Automake 1.3
-
-This is a small advance compared to 1.2.
-It adds support for assembly, and preliminary support for Java.
-
-Perl 5.004_04 is out, but fixes to support Perl 4 are still
-regularly submitted whenever Automake breaks it.
-
address@hidden 1998-09-06 @code{sourceware.cygnus.com} is on-line.
-
-Sourceware was setup by Jason Molenda to host open source projects.
-
address@hidden 1998-09-19 Automake CVS repository moved to
@code{sourceware.cygnus.com}
address@hidden 1998-10-26 @code{sourceware.cygnus.com} announces it hosts
Automake:
-Automake is now hosted on @code{sourceware.cygnus.com}. It has a
-publicly accessible CVS repository. This CVS repository is a copy of
-the one Tom was using on his machine, which in turn is based on
-a copy of the CVS repository of David MacKenzie. This is why we still
-have to full source history. (Automake was on Sourceware until 2007-10-29,
-when it moved to a git repository on @code{savannah.gnu.org},
-but the Sourceware host had been renamed to @code{sources.redhat.com}.)
-
-The oldest file in the administrative directory of the CVS repository
-that was created on Sourceware is dated 1998-09-19, while the
-announcement that @command{automake} and @command{autoconf} had joined
address@hidden was made on 1998-10-26. They were among the
-first projects to be hosted there.
-
-The heedful reader will have noticed Automake was exactly 4 years old
-on 1998-09-19.
-
address@hidden 1999-01-05 Ben Elliston releases Autoconf 2.13.
-
address@hidden 1999-01-14 Automake 1.4
-
-This release adds support for Fortran 77 and for the @code{include}
-statement. Also, @samp{+=} assignments are introduced, but it is
-still quite easy to fool Automake when mixing this with conditionals.
-
-These two releases, Automake 1.4 and Autoconf 2.13 make a duo that
-will be used together for years.
-
address@hidden is 7228 lines, plus 1591 lines of Makefile
-fragment, 20 macros (some 1.3 macros were finally contributed back to
-Autoconf), 197 test cases, and 51 pages of documentation.
-
address@hidden 1999-03-27 The @code{user-dep-branch} is created on the CVS
repository.
-
-This implements a new dependency tracking schemed that should be
-able to handle automatic dependency tracking using any compiler (not
-just gcc) and any make (not just GNU @command{make}). In addition,
-the new scheme should be more reliable than the old one, as
-dependencies are generated on the end user's machine. Alexandre Oliva
-creates depcomp for this purpose.
-
address@hidden Tracking Evolution}, for more details about the
-evolution of automatic dependency tracking in Automake.
-
address@hidden 1999-11-21 The @code{user-dep-branch} is merged into the main
trunk.
-
-This was a huge problem since we also had patches going in on the
-trunk. The merge took a long time and was very painful.
-
address@hidden 2000-05-10
-
-Since September 1999 and until 2003, Akim Demaille will be zealously
-revamping Autoconf.
-
address@hidden
-I think the next release should be called "3.0"address@hidden
-Let's face it: you've basically rewritten address@hidden
-Every weekend there are 30 new address@hidden
-I don't see how we could call this "2.15" with a straight address@hidden
--- Tom Tromey on @email{autoconf@@gnu.org}
address@hidden quotation
-
-Actually Akim works like a submarine: he will pile up patches while he
-works off-line during the weekend, and flush them in batch when he
-resurfaces on Monday.
-
address@hidden 2001-01-24
-
-On this Wednesday, Autoconf 2.49c, the last beta before Autoconf 2.50
-is out, and Akim has to find something to do during his week-end :)
-
address@hidden 2001-01-28
-
-Akim sends a batch of 14 patches to @email{automake@@gnu.org}.
-
address@hidden
-Aiieeee! I was dreading the day that the Demaillator turned his
-sights on address@hidden and now it has arrived! -- Tom Tromey
address@hidden quotation
-
-It's only the beginning: in two months he will send 192 patches. Then
-he would slow down so Tom can catch up and review all this. Initially
-Tom actually read all these patches, then he probably trustingly
-answered OK to most of them, and finally gave up and let Akim apply
-whatever he wanted. There was no way to keep up with that patch rate.
-
address@hidden
-Anyway the patch below won't apply since it predates Akim's
-sourcequake; I have yet to figure where the relevant passage has
-been moved :) -- Alexandre Duret-Lutz
address@hidden quotation
-
-All these patches were sent to and discussed on
address@hidden@@gnu.org}, so subscribed users were literally drowning in
-technical mails. Eventually, the @email{automake-patches@@gnu.org}
-mailing list was created in May.
-
-Year after year, Automake had drifted away from its initial design:
-construct @file{Makefile.in} by assembling various @file{Makefile}
-fragments. In 1.4, lots of @file{Makefile} rules are being emitted at
-various places in the @command{automake} script itself; this does not
-help ensuring a consistent treatment of these rules (for instance
-making sure that user-defined rules override Automake's own rules).
-One of Akim's goal was moving all these hard-coded rules to separate
address@hidden fragments, so the logic could be centralized in a
address@hidden fragment processor.
-
-Another significant contribution of Akim is the interface with the
-``trace'' feature of Autoconf. The way to scan @file{configure.in} at
-this time was to read the file and grep the various macro of interest
-to Automake. Doing so could break in many unexpected ways; @command{automake}
-could miss some definition (for instance @samp{AC_SUBST([$1], [$2])}
-where the arguments are known only when M4 is run), or conversely it
-could detect some macro that was not expanded (because it is called
-conditionally). In the CVS version of Autoconf, Akim had implemented
-the @option{--trace} option, which provides accurate information about
-where macros are actually called and with what arguments. Akim will
-equip Automake with a second @file{configure.in} scanner that uses
-this @option{--trace} interface. Since it was not sensible to drop the
-Autoconf 2.13 compatibility yet, this experimental scanner was only
-used when an environment variable was set, the traditional
-grep-scanner being still the default.
-
address@hidden 2001-04-25 Gary address@hidden releases Libtool 1.4
-
-It has been more than two years since Automake 1.4, CVS Automake has
-suffered lot's of heavy changes and still is not ready for release.
-Libtool 1.4 had to be distributed with a patch against Automake 1.4.
-
address@hidden 2001-05-08 Automake 1.4-p1
address@hidden 2001-05-24 Automake 1.4-p2
-
-Gary address@hidden, the principal Libtool maintainer, makes a ``patch
-release'' of Automake:
-
address@hidden
-The main purpose of this release is to have a stable automake
-which is compatible with the latest stable libtool.
address@hidden quotation
-
-The release also contains obvious fixes for bugs in Automake 1.4,
-some of which were reported almost monthly.
-
address@hidden 2001-05-21 Akim Demaille releases Autoconf 2.50
-
address@hidden 2001-06-07 Automake 1.4-p3
address@hidden 2001-06-10 Automake 1.4-p4
address@hidden 2001-07-15 Automake 1.4-p5
-
-Gary continues his patch-release series. These also add support for
-some new Autoconf 2.50 idioms. Essentially, Autoconf now advocates
address@hidden over @file{configure.in}, and it introduces a new
-syntax for @code{AC_OUTPUT}ing files.
-
address@hidden 2001-08-23 Automake 1.5
-
-A major and long-awaited release, that comes more than two years after
-1.4. It brings many changes, among which:
address@hidden
address@hidden The new dependency tracking scheme that uses @command{depcomp}.
-Aside from the improvement on the dependency tracking itself
-(@pxref{Dependency Tracking Evolution}), this also streamlines the use
-of @command{automake}-generated @file{Makefile.in}s as the @file{Makefile.in}s
-used during development are now the same as those used in
-distributions. Before that the @file{Makefile.in}s generated for
-maintainers required GNU @command{make} and GCC, they were different
-from the portable @file{Makefile} generated for distribution; this was
-causing some confusion.
-
address@hidden Support for per-target compilation flags.
-
address@hidden Support for reference to files in subdirectories in most
address@hidden variables.
-
address@hidden Introduction of the @code{dist_}, @code{nodist_}, and
@code{nobase_}
-prefixes.
address@hidden Perl 4 support is finally dropped.
address@hidden itemize
-
-1.5 did break several packages that worked with 1.4. Enough so that
-Linux distributions could not easily install the new Automake version
-without breaking many of the packages for which they had to run
address@hidden
-
-Some of these breakages were effectively bugs that would eventually be
-fixed in the next release. However, a lot of damage was caused by
-some changes made deliberately to render Automake stricter on some
-setup we did consider bogus. For instance, @samp{make distcheck} was
-improved to check that @samp{make uninstall} did remove all the files
address@hidden install} installed, that @samp{make distclean} did not omit
-some file, and that a VPATH build would work even if the source
-directory was read-only. Similarly, Automake now rejects multiple
-definitions of the same variable (because that would mix very badly
-with conditionals), and @samp{+=} assignments with no previous
-definition. Because these changes all occurred suddenly after 1.4 had
-been established for more than two years, it hurt users.
-
-To make matter worse, meanwhile Autoconf (now at version 2.52) was
-facing similar troubles, for similar reasons.
-
address@hidden 2002-03-05 Automake 1.6
-
-This release introduced versioned installation (@pxref{API Versioning, ,
-API Versioning, automake, GNU Automake}). This was mainly pushed by
-Havoc Pennington, taking the GNOME source tree as motive: due to
-incompatibilities between the autotools it's impossible for the GNOME
-packages to switch to Autoconf 2.53 and Automake 1.5 all at once, so
-they are currently stuck with Autoconf 2.13 and Automake 1.4.
-
-The idea was to call this version @file{automake-1.6}, call all its
-bug-fix versions identically, and switch to @file{automake-1.7} for
-the next release that adds new features or changes some rules. This
-scheme implies maintaining a bug-fix branch in addition to the
-development trunk, which means more work from the maintainer, but
-providing regular bug-fix releases proved to be really worthwhile.
-
-Like 1.5, 1.6 also introduced a bunch of incompatibilities, intentional or
-not. Perhaps the more annoying was the dependence on the newly
-released Autoconf 2.53. Autoconf seemed to have stabilized enough
-since its explosive 2.50 release and included changes required to fix
-some bugs in Automake. In order to upgrade to Automake 1.6, people
-now had to upgrade Autoconf too; for some packages it was no picnic.
-
-While versioned installation helped people to upgrade, it also
-unfortunately allowed people not to upgrade. At the time of writing,
-some Linux distributions are shipping packages for Automake 1.4, 1.5,
-1.6, 1.7, 1.8, and 1.9. Most of these still install 1.4 by default.
-Some distribution also call 1.4 the ``stable'' version, and present
-``1.9'' as the development version; this does not really makes sense
-since 1.9 is way more solid than 1.4. All this does not help the
-newcomer.
-
address@hidden 2002-04-11 Automake 1.6.1
-
-1.6, and the upcoming 1.4-p6 release were the last release by Tom.
-This one and those following will be handled by Alexandre
-Duret-Lutz. Tom is still around, and will be there until about 1.7,
-but his interest into Automake is drifting away towards projects like
address@hidden
-
-Alexandre has been using Automake since 2000, and started to
-contribute mostly on Akim's incitement (Akim and Alexandre have been
-working in the same room from 1999 to 2002). In 2001 and 2002 he had
-a lot of free time to enjoy hacking Automake.
-
address@hidden 2002-06-14 Automake 1.6.2
-
address@hidden 2002-07-28 Automake 1.6.3
address@hidden 2002-07-28 Automake 1.4-p6
-
-Two releases on the same day. 1.6.3 is a bug-fix release.
-
-Tom Tromey backported the versioned installation mechanism on the 1.4
-branch, so that Automake 1.6.x and Automake 1.4-p6 could be installed
-side by side. Another request from the GNOME folks.
-
address@hidden 2002-09-25 Automake 1.7
-
-This release switches to the new @file{configure.ac} scanner Akim
-was experimenting in 1.5.
-
address@hidden 2002-10-16 Automake 1.7.1
address@hidden 2002-12-06 Automake 1.7.2
address@hidden 2003-02-20 Automake 1.7.3
address@hidden 2003-04-23 Automake 1.7.4
address@hidden 2003-05-18 Automake 1.7.5
address@hidden 2003-07-10 Automake 1.7.6
address@hidden 2003-09-07 Automake 1.7.7
address@hidden 2003-10-07 Automake 1.7.8
-
-Many bug-fix releases. 1.7 lasted because the development version
-(upcoming 1.8) was suffering some major internal revamping.
-
address@hidden 2003-10-26 Automake on screen
-
-Episode 49, `Repercussions', in the third season of the `Alias' TV
-show is first aired.
-
-Marshall, one of the characters, is working on a computer virus that he
-has to modify before it gets into the wrong hands or something like
-that. The screenshots you see do not show any program code, they show
-a @file{Makefile.in} generated by automake...
-
address@hidden 2003-11-09 Automake 1.7.9
-
address@hidden 2003-12-10 Automake 1.8
-
-The most striking update is probably that of @command{aclocal}.
-
address@hidden now uses @code{m4_include} in the produced
address@hidden when the included macros are already distributed
-with the package (an idiom used in many packages), which reduces code
-duplication. Many people liked that, but in fact this change was
-really introduced to fix a bug in rebuild rules: @file{Makefile.in}
-must be rebuilt whenever a dependency of @file{configure} changes, but
-all the @file{m4} files included in @file{aclocal.m4} where unknown
-from @command{automake}. Now @command{automake} can just trace the
address@hidden to discover the dependencies.
-
address@hidden also starts using the @option{--trace} Autoconf option
-in order to discover used macros more accurately. This will turn out
-to be very tricky (later releases will improve this) as people had
-devised many ways to cope with the limitation of previous
address@hidden versions, notably using handwritten
address@hidden: @command{aclocal} must make sure not to redefine a
-rule that is already included by such statement.
-
-Automake also has seen its guts rewritten. Although this rewriting
-took a lot of efforts, it is only apparent to the users in that some
-constructions previously disallowed by the implementation now work
-nicely. Conditionals, Locations, Variable and Rule definitions,
-Options: these items on which Automake works have been rewritten as
-separate Perl modules, and documented.
-
address@hidden 2004-01-11 Automake 1.8.1
address@hidden 2004-01-12 Automake 1.8.2
address@hidden 2004-03-07 Automake 1.8.3
address@hidden 2004-04-25 Automake 1.8.4
address@hidden 2004-05-16 Automake 1.8.5
-
address@hidden 2004-07-28 Automake 1.9
-
-This release tries to simplify the compilation rules it outputs to
-reduce the size of the Makefile. The complaint initially come from
-the libgcj developers. Their @file{Makefile.in} generated with
-Automake 1.4 and custom build rules (1.4 did not support compiled
-Java) is address@hidden The one generated by 1.8 was over address@hidden 1.9
gets it
-down to address@hidden
-
-Aside from this it contains mainly minor changes and bug-fixes.
-
address@hidden 2004-08-11 Automake 1.9.1
address@hidden 2004-09-19 Automake 1.9.2
-
-Automake has ten years. This chapter of the manual was initially
-written for this occasion.
-
address@hidden 2007-10-29 Automake repository moves to @code{savannah.gnu.org}
-and uses git as primary repository.
-
address@hidden table
-
address@hidden Dependency Tracking Evolution
address@hidden Evolution of Automatic Dependency Tracking
-
-Over the years Automake has deployed three different dependency
-tracking methods. Each method, including the current one, has had
-flaws of various sorts. Here we lay out the different dependency
-tracking methods, their flaws, and their fixes. We conclude with
-recommendations for tool writers, and by indicating future directions
-for dependency tracking work in Automake.
-
address@hidden
-* First Take on Dependencies:: Precomputed dependency tracking
-* Dependencies As Side Effects:: Update at developer compile time
-* Dependencies for the User:: Update at user compile time
-* Techniques for Dependencies:: Alternative approaches
address@hidden menu
-
address@hidden First Take on Dependencies
address@hidden First Take on Dependency Tracking
address@hidden Description
-
-Our first attempt at automatic dependency tracking was based on the
-method recommended by GNU @command{make}. (@pxref{Automatic
-Prerequisites, , Generating Prerequisites Automatically, make, The GNU
-make Manual})
-
-This version worked by precomputing dependencies ahead of time. For
-each source file, it had a special @file{.P} file that held the
-dependencies. There was a rule to generate a @file{.P} file by
-invoking the compiler appropriately. All such @file{.P} files were
-included by the @file{Makefile}, thus implicitly becoming dependencies
-of @file{Makefile}.
-
address@hidden Bugs
-
-This approach had several critical bugs.
-
address@hidden
address@hidden
-The code to generate the @file{.P} file relied on @command{gcc}.
-(A limitation, not technically a bug.)
address@hidden
-The dependency tracking mechanism itself relied on GNU @command{make}.
-(A limitation, not technically a bug.)
address@hidden
-Because each @file{.P} file was a dependency of @file{Makefile}, this
-meant that dependency tracking was done eagerly by @command{make}.
-For instance, @samp{make clean} would cause all the dependency files
-to be updated, and then immediately removed. This eagerness also
-caused problems with some configurations; if a certain source file
-could not be compiled on a given architecture for some reason,
-dependency tracking would fail, aborting the entire build.
address@hidden
-As dependency tracking was done as a pre-pass, compile times were
-doubled--the compiler had to be run twice per source file.
address@hidden
address@hidden dist} re-ran @command{automake} to generate a
address@hidden that did not have automatic dependency tracking (and
-that was thus portable to any version of @command{make}). In order to
-do this portably, Automake had to scan the dependency files and remove
-any reference that was to a source file not in the distribution.
-This process was error-prone. Also, if @samp{make dist} was run in an
-environment where some object file had a dependency on a source file
-that was only conditionally created, Automake would generate a
address@hidden that referred to a file that might not appear in the
-end user's build. A special, hacky mechanism was required to work
-around this.
address@hidden itemize
-
address@hidden Historical Note
-
-The code generated by Automake is often inspired by the
address@hidden style of a particular author. In the case of the first
-implementation of dependency tracking, I believe the impetus and
-inspiration was Jim Meyering. (I could be mistaken. If you know
-otherwise feel free to correct me.)
-
address@hidden Dependencies As Side Effects
address@hidden Dependencies As Side Effects
address@hidden Description
-
-The next refinement of Automake's automatic dependency tracking scheme
-was to implement dependencies as side effects of the compilation.
-This was aimed at solving the most commonly reported problems with the
-first approach. In particular we were most concerned with eliminating
-the weird rebuilding effect associated with make clean.
-
-In this approach, the @file{.P} files were included using the
address@hidden command, which let us create these files lazily. This
-avoided the @samp{make clean} problem.
-
-We only computed dependencies when a file was actually compiled. This
-avoided the performance penalty associated with scanning each file
-twice. It also let us avoid the other problems associated with the
-first, eager, implementation. For instance, dependencies would never
-be generated for a source file that was not compilable on a given
-architecture (because it in fact would never be compiled).
-
address@hidden Bugs
-
address@hidden
address@hidden
-This approach also relied on the existence of @command{gcc} and GNU
address@hidden (A limitation, not technically a bug.)
address@hidden
-Dependency tracking was still done by the developer, so the problems
-from the first implementation relating to massaging of dependencies by
address@hidden dist} were still in effect.
address@hidden
-This implementation suffered from the ``deleted header file'' problem.
-Suppose a lazily-created @file{.P} file includes a dependency on a
-given header file, like this:
-
address@hidden
-maude.o: maude.c something.h
address@hidden example
-
-Now suppose that you remove @file{something.h} and update @file{maude.c}
-so that this include is no longer needed. If you run @command{make},
-you will get an error because there is no way to create
address@hidden
-
-We fixed this problem in a later release by further massaging the
-output of @command{gcc} to include a dummy dependency for each header
-file.
address@hidden itemize
-
address@hidden Dependencies for the User
address@hidden Dependencies for the User
address@hidden Description
-
-The bugs associated with @samp{make dist}, over time, became a real
-problem. Packages using Automake were being built on a large number
-of platforms, and were becoming increasingly complex. Broken
-dependencies were distributed in ``portable'' @file{Makefile.in}s,
-leading to user complaints. Also, the requirement for @command{gcc}
-and GNU @command{make} was a constant source of bug reports. The next
-implementation of dependency tracking aimed to remove these problems.
-
-We realized that the only truly reliable way to automatically track
-dependencies was to do it when the package itself was built. This
-meant discovering a method portable to any version of make and any
-compiler. Also, we wanted to preserve what we saw as the best point
-of the second implementation: dependency computation as a side effect
-of compilation.
-
-In the end we found that most modern make implementations support some
-form of include directive. Also, we wrote a wrapper script that let
-us abstract away differences between dependency tracking methods for
-compilers. For instance, some compilers cannot generate dependencies
-as a side effect of compilation. In this case we simply have the
-script run the compiler twice. Currently our wrapper script
-(@command{depcomp}) knows about twelve different compilers (including
-a "compiler" that simply invokes @command{makedepend} and then the
-real compiler, which is assumed to be a standard Unix-like C compiler
-with no way to do dependency tracking).
-
address@hidden Bugs
-
address@hidden
address@hidden
-Running a wrapper script for each compilation slows down the build.
address@hidden
-Many users don't really care about precise dependencies.
address@hidden
-This implementation, like every other automatic dependency tracking
-scheme in common use today (indeed, every one we've ever heard of),
-suffers from the ``duplicated new header'' bug.
-
-This bug occurs because dependency tracking tools, such as the
-compiler, only generate dependencies on the successful opening of a
-file, and not on every probe.
-
-Suppose for instance that the compiler searches three directories for
-a given header, and that the header is found in the third directory.
-If the programmer erroneously adds a header file with the same name to
-the first directory, then a clean rebuild from scratch could fail
-(suppose the new header file is buggy), whereas an incremental rebuild
-will succeed.
-
-What has happened here is that people have a misunderstanding of what
-a dependency is. Tool writers think a dependency encodes information
-about which files were read by the compiler. However, a dependency
-must actually encode information about what the compiler tried to do.
-
-This problem is not serious in practice. Programmers typically do not
-use the same name for a header file twice in a given project. (At
-least, not in C or C++. This problem may be more troublesome in
-Java.) This problem is easy to fix, by modifying dependency
-generators to record every probe, instead of every successful open.
-
address@hidden
-Since Automake generates dependencies as a side effect of compilation,
-there is a bootstrapping problem when header files are generated by
-running a program. The problem is that, the first time the build is
-done, there is no way by default to know that the headers are
-required, so make might try to run a compilation for which the headers
-have not yet been built.
-
-This was also a problem in the previous dependency tracking implementation.
-
-The current fix is to use @code{BUILT_SOURCES} to list built headers
-(@pxref{Sources, , Sources, automake, GNU Automake}). This causes them
-to be built before any other build rules are run. This is unsatisfactory
-as a general solution, however in practice it seems sufficient for most
-actual programs.
address@hidden itemize
-
-This code is used since Automake 1.5.
-
-In GCC 3.0, we managed to convince the maintainers to add special
-command-line options to help Automake more efficiently do its job. We
-hoped this would let us avoid the use of a wrapper script when
-Automake's automatic dependency tracking was used with @command{gcc}.
-
-Unfortunately, this code doesn't quite do what we want. In
-particular, it removes the dependency file if the compilation fails;
-we'd prefer that it instead only touch the file in any way if the
-compilation succeeds.
-
-Nevertheless, since Automake 1.7, when a recent @command{gcc} is
-detected at @command{configure} time, we inline the
-dependency-generation code and do not use the @command{depcomp}
-wrapper script. This makes compilations faster for those using this
-compiler (probably our primary user base). The counterpart is that
-because we have to encode two compilation rules in @file{Makefile}
-(with or without @command{depcomp}), the produced @file{Makefile}s are
-larger.
-
address@hidden Techniques for Dependencies
address@hidden Techniques for Computing Dependencies
-
-There are actually several ways for a build tool like Automake to
-cause tools to generate dependencies.
-
address@hidden @asis
address@hidden @command{makedepend}
-This was a commonly-used method in the past. The idea is to run a
-special program over the source and have it generate dependency
-information. Traditional implementations of @command{makedepend} are
-not completely precise; ordinarily they were conservative and
-discovered too many dependencies.
address@hidden The tool
-An obvious way to generate dependencies is to simply write the tool so
-that it can generate the information needed by the build tool. This is
-also the most portable method. Many compilers have an option to
-generate dependencies. Unfortunately, not all tools provide such an
-option.
address@hidden The file system
-It is possible to write a special file system that tracks opens,
-reads, writes, etc, and then feed this information back to the build
-tool. @command{clearmake} does this. This is a very powerful
-technique, as it doesn't require cooperation from the
-tool. Unfortunately it is also very difficult to implement and also
-not practical in the general case.
address@hidden @code{LD_PRELOAD}
-Rather than use the file system, one could write a special library to
-intercept @code{open} and other syscalls. This technique is also quite
-powerful, but unfortunately it is not portable enough for use in
address@hidden
address@hidden table
-
address@hidden
-* Recommendations for Tool Writers::
-* Future Directions for Dependencies::
address@hidden menu
-
address@hidden Recommendations for Tool Writers
address@hidden Recommendations for Tool Writers
-
-We think that every compilation tool ought to be able to generate
-dependencies as a side effect of compilation. Furthermore, at least
-while @command{make}-based tools are nearly universally in use (at
-least in the free software community), the tool itself should generate
-dummy dependencies for header files, to avoid the deleted header file
-bug. Finally, the tool should generate a dependency for each probe,
-instead of each successful file open, in order to avoid the duplicated
-new header bug.
-
address@hidden Future Directions for Dependencies
address@hidden Future Directions for Dependencies
-
-Currently, only languages and compilers understood by Automake can
-have dependency tracking enabled. We would like to see if it is
-practical (and worthwhile) to let this support be extended by the user
-to languages unknown to Automake.
-
address@hidden Releases
address@hidden Release Statistics
-
-The following table (inspired by @samp{perlhist(1)}) quantifies the
-evolution of Automake using these metrics:
-
address@hidden @asis
address@hidden Date, Rel
-The date and version of the release.
address@hidden am
-The number of lines of the @command{automake} script.
address@hidden acl
-The number of lines of the @command{aclocal} script.
address@hidden pm
-The number of lines of the @command{Perl} supporting modules.
address@hidden @file{*.am}
-The number of lines of the @file{Makefile} fragments. The number in
-parentheses is the number of files.
address@hidden m4
-The number of lines (and files) of Autoconf macros.
address@hidden doc
-The number of pages of the documentation (the Postscript version).
address@hidden t
-The number of test cases in the test suite. Of those, the number in
-parentheses is the number of generated test cases.
address@hidden table
-
address@hidden {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888
(88)} {888} {888 (88)}
address@hidden Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am}
@tab m4 @tab doc @tab t
address@hidden 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299
(24) @tab @tab @tab
address@hidden 1994-11-05 @tab CVS @tab 208 @tab @tab @tab 332
(28) @tab @tab @tab
address@hidden 1995-11-23 @tab 0.20 @tab 533 @tab @tab @tab 458
(35) @tab @tab 9 @tab
address@hidden 1995-11-26 @tab 0.21 @tab 613 @tab @tab @tab 480
(36) @tab @tab 11 @tab
address@hidden 1995-11-28 @tab 0.22 @tab 1116 @tab @tab @tab 539
(38) @tab @tab 12 @tab
address@hidden 1995-11-29 @tab 0.23 @tab 1240 @tab @tab @tab 541
(38) @tab @tab 12 @tab
address@hidden 1995-12-08 @tab 0.24 @tab 1462 @tab @tab @tab 504
(33) @tab @tab 14 @tab
address@hidden 1995-12-10 @tab 0.25 @tab 1513 @tab @tab @tab 511
(37) @tab @tab 15 @tab
address@hidden 1996-01-03 @tab 0.26 @tab 1706 @tab @tab @tab 438
(36) @tab @tab 16 @tab
address@hidden 1996-01-03 @tab 0.27 @tab 1706 @tab @tab @tab 438
(36) @tab @tab 16 @tab
address@hidden 1996-01-13 @tab 0.28 @tab 1964 @tab @tab @tab 934
(33) @tab @tab 16 @tab
address@hidden 1996-02-07 @tab 0.29 @tab 2299 @tab @tab @tab 936
(33) @tab @tab 17 @tab
address@hidden 1996-02-24 @tab 0.30 @tab 2544 @tab @tab @tab 919
(32) @tab 85 (1) @tab 20 @tab 9
address@hidden 1996-03-11 @tab 0.31 @tab 2877 @tab @tab @tab 919
(32) @tab 85 (1) @tab 29 @tab 17
address@hidden 1996-04-27 @tab 0.32 @tab 3058 @tab @tab @tab 921
(31) @tab 85 (1) @tab 30 @tab 26
address@hidden 1996-05-18 @tab 0.33 @tab 3110 @tab @tab @tab 926
(31) @tab 105 (1) @tab 30 @tab 35
address@hidden 1996-05-28 @tab 1.0 @tab 3134 @tab @tab @tab 973
(32) @tab 105 (1) @tab 30 @tab 38
address@hidden 1997-06-22 @tab 1.2 @tab 6089 @tab 385 @tab @tab 1294
(36) @tab 592 (20) @tab 37 @tab 126
address@hidden 1998-04-05 @tab 1.3 @tab 6415 @tab 422 @tab @tab 1470
(39) @tab 741 (23) @tab 39 @tab 156
address@hidden 1999-01-14 @tab 1.4 @tab 7240 @tab 426 @tab @tab 1591
(40) @tab 734 (20) @tab 51 @tab 197
address@hidden 2001-05-08 @tab 1.4-p1 @tab 7251 @tab 426 @tab @tab 1591
(40) @tab 734 (20) @tab 51 @tab 197
address@hidden 2001-05-24 @tab 1.4-p2 @tab 7268 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 197
address@hidden 2001-06-07 @tab 1.4-p3 @tab 7312 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 197
address@hidden 2001-06-10 @tab 1.4-p4 @tab 7321 @tab 439 @tab @tab 1591
(40) @tab 734 (20) @tab 49 @tab 198
address@hidden 2001-07-15 @tab 1.4-p5 @tab 7228 @tab 426 @tab @tab 1596
(40) @tab 734 (20) @tab 51 @tab 198
address@hidden 2001-08-23 @tab 1.5 @tab 8016 @tab 475 @tab 600 @tab 2654
(39) @tab 1166 (29) @tab 63 @tab 327
address@hidden 2002-03-05 @tab 1.6 @tab 8465 @tab 475 @tab 1136 @tab 2732
(39) @tab 1603 (27) @tab 66 @tab 365
address@hidden 2002-04-11 @tab 1.6.1 @tab 8544 @tab 475 @tab 1136 @tab 2741
(39) @tab 1603 (27) @tab 66 @tab 372
address@hidden 2002-06-14 @tab 1.6.2 @tab 8575 @tab 475 @tab 1136 @tab 2800
(39) @tab 1609 (27) @tab 67 @tab 386
address@hidden 2002-07-28 @tab 1.6.3 @tab 8600 @tab 475 @tab 1153 @tab 2809
(39) @tab 1609 (27) @tab 67 @tab 391
address@hidden 2002-07-28 @tab 1.4-p6 @tab 7332 @tab 455 @tab @tab 1596
(40) @tab 735 (20) @tab 49 @tab 197
address@hidden 2002-09-25 @tab 1.7 @tab 9189 @tab 471 @tab 1790 @tab 2965
(39) @tab 1606 (28) @tab 73 @tab 430
address@hidden 2002-10-16 @tab 1.7.1 @tab 9229 @tab 475 @tab 1790 @tab 2977
(39) @tab 1606 (28) @tab 73 @tab 437
address@hidden 2002-12-06 @tab 1.7.2 @tab 9334 @tab 475 @tab 1790 @tab 2988
(39) @tab 1606 (28) @tab 77 @tab 445
address@hidden 2003-02-20 @tab 1.7.3 @tab 9389 @tab 475 @tab 1790 @tab 3023
(39) @tab 1651 (29) @tab 84 @tab 448
address@hidden 2003-04-23 @tab 1.7.4 @tab 9429 @tab 475 @tab 1790 @tab 3031
(39) @tab 1644 (29) @tab 85 @tab 458
address@hidden 2003-05-18 @tab 1.7.5 @tab 9429 @tab 475 @tab 1790 @tab 3033
(39) @tab 1645 (29) @tab 85 @tab 459
address@hidden 2003-07-10 @tab 1.7.6 @tab 9442 @tab 475 @tab 1790 @tab 3033
(39) @tab 1660 (29) @tab 85 @tab 461
address@hidden 2003-09-07 @tab 1.7.7 @tab 9443 @tab 475 @tab 1790 @tab 3041
(39) @tab 1660 (29) @tab 90 @tab 467
address@hidden 2003-10-07 @tab 1.7.8 @tab 9444 @tab 475 @tab 1790 @tab 3041
(39) @tab 1660 (29) @tab 90 @tab 468
address@hidden 2003-11-09 @tab 1.7.9 @tab 9444 @tab 475 @tab 1790 @tab 3048
(39) @tab 1660 (29) @tab 90 @tab 468
address@hidden 2003-12-10 @tab 1.8 @tab 7171 @tab 585 @tab 7730 @tab 3236
(39) @tab 1666 (31) @tab 104 @tab 521
address@hidden 2004-01-11 @tab 1.8.1 @tab 7217 @tab 663 @tab 7726 @tab 3287
(39) @tab 1686 (31) @tab 104 @tab 525
address@hidden 2004-01-12 @tab 1.8.2 @tab 7217 @tab 663 @tab 7726 @tab 3288
(39) @tab 1686 (31) @tab 104 @tab 526
address@hidden 2004-03-07 @tab 1.8.3 @tab 7214 @tab 686 @tab 7735 @tab 3303
(39) @tab 1695 (31) @tab 111 @tab 530
address@hidden 2004-04-25 @tab 1.8.4 @tab 7214 @tab 686 @tab 7736 @tab 3310
(39) @tab 1701 (31) @tab 112 @tab 531
address@hidden 2004-05-16 @tab 1.8.5 @tab 7240 @tab 686 @tab 7736 @tab 3299
(39) @tab 1701 (31) @tab 112 @tab 533
address@hidden 2004-07-28 @tab 1.9 @tab 7508 @tab 715 @tab 7794 @tab 3352
(40) @tab 1812 (32) @tab 115 @tab 551
address@hidden 2004-08-11 @tab 1.9.1 @tab 7512 @tab 715 @tab 7794 @tab 3354
(40) @tab 1812 (32) @tab 115 @tab 552
address@hidden 2004-09-19 @tab 1.9.2 @tab 7512 @tab 715 @tab 7794 @tab 3354
(40) @tab 1812 (32) @tab 132 @tab 554
address@hidden 2004-11-01 @tab 1.9.3 @tab 7507 @tab 718 @tab 7804 @tab 3354
(40) @tab 1812 (32) @tab 134 @tab 556
address@hidden 2004-12-18 @tab 1.9.4 @tab 7508 @tab 718 @tab 7856 @tab 3361
(40) @tab 1811 (32) @tab 140 @tab 560
address@hidden 2005-02-13 @tab 1.9.5 @tab 7523 @tab 719 @tab 7859 @tab 3373
(40) @tab 1453 (32) @tab 142 @tab 562
address@hidden 2005-07-10 @tab 1.9.6 @tab 7539 @tab 699 @tab 7867 @tab 3400
(40) @tab 1453 (32) @tab 144 @tab 570
address@hidden 2006-10-15 @tab 1.10 @tab 7859 @tab 1072 @tab 8024 @tab 3512
(40) @tab 1496 (34) @tab 172 @tab 604
address@hidden 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520
(40) @tab 1499 (34) @tab 173 @tab 617
address@hidden 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540
(40) @tab 1509 (34) @tab 176 @tab 628
address@hidden 2009-05-17 @tab 1.11 @tab 8721 @tab 1092 @tab 8289 @tab 4164
(42) @tab 1714 (37) @tab 181 @tab 732 (20)
address@hidden multitable
-
-
address@hidden ==========================================================
Appendices
-
address@hidden
address@hidden Copying This Manual
address@hidden Copying This Manual
-
address@hidden
-* GNU Free Documentation License:: License for copying this manual
address@hidden menu
-
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden fdl.texi
-
address@hidden
diff --git a/doc/automake.texi b/doc/automake-ng.texi
similarity index 98%
rename from doc/automake.texi
rename to doc/automake-ng.texi
index c5ac92d..57442c0 100644
--- a/doc/automake.texi
+++ b/doc/automake-ng.texi
@@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
address@hidden automake.info
address@hidden automake
address@hidden automake-ng.info
address@hidden automake-ng
@setchapternewpage off
@c %**end of header
@@ -15,11 +15,11 @@
@address@hidden@r{]}
@end macro
address@hidden PACKAGE_BUGREPORT bug-automake@@gnu.org
address@hidden PACKAGE_BUGREPORT automake-ng@@gnu.org
@copying
-This manual is for GNU Automake (version @value{VERSION},
+This manual is for GNU Automake-NG (version @value{VERSION},
@value{UPDATED}), a program that creates GNU standards-compliant
Makefiles from template files.
@@ -38,21 +38,23 @@ section entitled ``GNU Free Documentation License.''
@dircategory Software development
@direntry
-* Automake: (automake). Making GNU standards-compliant Makefiles.
+* Automake-NG: (automake-ng). Making GNU standards-compliant Makefiles.
@end direntry
@dircategory Individual utilities
@direntry
-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4.
-* automake-invocation: (automake)automake Invocation. Generating Makefile.in.
+* aclocal-invocation: (automake-ng)aclocal Invocation. Generating aclocal.m4.
+* automake-invocation: (automake-ng)automake Invocation. Generating
Makefile.in.
@end direntry
@titlepage
address@hidden GNU Automake
address@hidden GNU Automake-NG
@subtitle For version @value{VERSION}, @value{UPDATED}
@author David MacKenzie
@author Tom Tromey
@author Alexandre Duret-Lutz
address@hidden Ralf Wildenhues
address@hidden Stefano Lattarini
@page
@vskip 0pt plus 1filll
@insertcopying
@@ -88,12 +90,12 @@ section entitled ``GNU Free Documentation License.''
@ifnottex
@node Top
@comment node-name, next, previous, up
address@hidden GNU Automake
address@hidden GNU Automake-NG
@insertcopying
@menu
-* Introduction:: Automake's purpose
+* Introduction:: Automake-NG's purpose
* Autotools Introduction:: An Introduction to the Autotools
* Generalities:: General ideas
* Examples:: Some example packages
@@ -401,7 +403,7 @@ Indices
@node Introduction
@chapter Introduction
-Automake is a tool for automatically generating @file{Makefile.in}s
+Automake-NG is a tool for automatically generating @file{Makefile.in}s
from files called @file{Makefile.am}. Each @file{Makefile.am} is
basically a series of @command{make} variable
address@hidden variables are also called @dfn{make macros}
@@ -414,30 +416,35 @@ the GNU Makefile standards.
The GNU Makefile Standards Document
(@pxref{Makefile Conventions, , , standards, The GNU Coding Standards})
-is long, complicated, and subject to change. The goal of Automake is to
-remove the burden of Makefile maintenance from the back of the
-individual GNU maintainer (and put it on the back of the Automake
+is long, complicated, and subject to change. The goal of Automake-NG
+is to remove the burden of Makefile maintenance from the back of the
+individual GNU maintainer (and put it on the back of the Automake-NG
maintainers).
-The typical Automake input file is simply a series of variable definitions.
-Each such file is processed to create a @file{Makefile.in}. There
-should generally be one @file{Makefile.am} per directory of a project.
+The typical Automake-NG input file is simply a series of variable
+definitions. Each such file is processed to create a @file{Makefile.in}.
+There should generally be one @file{Makefile.am} per directory of a
+project.
address@hidden Constraints of Automake-NG
address@hidden Automake-NG constraints
@cindex Constraints of Automake
@cindex Automake constraints
-Automake does constrain a project in certain ways; for instance, it
+Automake-NG does constrain a project in certain ways; for instance, it
assumes that the project uses Autoconf (@pxref{Top, , Introduction,
autoconf, The Autoconf Manual}), and enforces certain restrictions on
the @file{configure.ac} contents.
address@hidden Automake-NG requirements
address@hidden Requirements, Automake-NG
@cindex Automake requirements
@cindex Requirements, Automake
-Automake requires @command{perl} in order to generate the
address@hidden However, the distributions created by Automake are
-fully GNU standards-compliant, and do not require @command{perl} in order
-to be built.
+Automake-NG requires @command{perl} in order to generate the
address@hidden However, the distributions created by Automake-NG
+are fully GNU standards-compliant, and do not require @command{perl} in
+order to be built.
@cindex Bugs, reporting
@cindex Reporting bugs
@@ -448,11 +455,11 @@ For more information on bug reports, @xref{Reporting
Bugs}.
@node Autotools Introduction
@chapter An Introduction to the Autotools
-If you are new to Automake, maybe you know that it is part of a set of
+If you are new to Automake-NG, maybe you know that it is part of a set of
tools called @emph{The Autotools}. Maybe you've already delved into a
package full of files named @file{configure}, @file{configure.ac},
@file{Makefile.in}, @file{Makefile.am}, @file{aclocal.m4}, @dots{},
-some of them claiming to be @emph{generated by} Autoconf or Automake.
+some of them claiming to be @emph{generated by} Autoconf or Automake-NG.
But the exact purpose of these files and their relations is probably
fuzzy. The goal of this chapter is to introduce you to this machinery,
to show you how it works and how powerful it is. If you've never
@@ -522,8 +529,8 @@ other packages: following any existing convention has its
advantages.
@cindex Autotools, introduction
The Autotools are tools that will create a GNU Build System for your
-package. Autoconf mostly focuses on @file{configure} and Automake on
address@hidden It is entirely possible to create a GNU Build
+package. Autoconf mostly focuses on @file{configure} and Automake-NG
+on @file{Makefile}s. It is entirely possible to create a GNU Build
System without the help of these tools. However it is rather
burdensome and error-prone. We will discuss this again after some
illustration of the GNU Build System in action.
@@ -539,15 +546,15 @@ illustration of the GNU Build System in action.
In this section we explore several use cases for the GNU Build System.
You can replay all these examples on the @file{amhello-1.0.tar.gz}
-package distributed with Automake. If Automake is installed on your
-system, you should find a copy of this file in
+package distributed with Automake-NG. If Automake-NG is installed on
+your system, you should find a copy of this file in
@address@hidden/share/doc/automake/amhello-1.0.tar.gz}, where
@var{prefix} is the installation prefix specified during configuration
-(@var{prefix} defaults to @file{/usr/local}, however if Automake was
+(@var{prefix} defaults to @file{/usr/local}, however if Automake-NG was
installed by some GNU/Linux distribution it most likely has been set
-to @file{/usr}). If you do not have a copy of Automake installed,
+to @file{/usr}). If you do not have a copy of Automake-NG installed,
you can find a copy of this file inside the @file{doc/} directory of
-the Automake package.
+the Automake-NG package.
Some of the following use cases present features that are in fact
extensions to the GNU Build System. Read: they are not specified by
@@ -1452,12 +1459,12 @@ main (void)
package.
@example
~/amhello % @kbd{cat README}
-This is a demonstration package for GNU Automake.
-Type `info Automake' to read the Automake manual.
+This is a demonstration package for GNU Automake-NG.
+Type 'info Automake-NG' to read its manual.
@end example
@item
address@hidden and @file{src/Makefile.am} contain Automake
address@hidden and @file{src/Makefile.am} contain Automake-NG
instructions for these two directories.
@example
@@ -1566,7 +1573,7 @@ when you execute @command{make}.
@command{automake}, and a bunch of other commands in the right order.
If you are beginning with these tools, it is not important to figure
out in which order all these tools should be invoked and why. However,
-because Autoconf and Automake have separate manuals, the important
+because Autoconf and Automake-NG have separate manuals, the important
point to understand is that @command{autoconf} is in charge of
creating @file{configure} from @file{configure.ac}, while
@command{automake} is in charge of creating @file{Makefile.in}s from
@@ -7243,11 +7250,10 @@ The symptom is as follows.
@example
% make
-source='foo.c' object='foo.o' libtool=no \
-depfile='.deps/foo.Po' tmpdepfile='.deps/foo.TPo' \
-depmode=gcc /bin/sh ./depcomp \
-gcc -I. -I. -g -O2 -c `test -f 'foo.c' || echo './'`foo.c
-foo.c:2: bindir.h: No such file or directory
+test -d .deps || mkdir -p .deps
+gcc ... -I. -g -O2 -MT foo.o -MD -MP -MF .deps/foo.Tpo -c -o foo.o foo.c
+foo.c:2:20: fatal error: bindir.h: No such file or directory
+compilation terminated.
make: *** [foo.o] Error 1
@end example
@@ -7279,13 +7285,12 @@ See how @file{bindir.h} gets built first:
@example
% make
echo '#define bindir "/usr/local/bin"' >bindir.h
-make all-am
+make all-am
make[1]: Entering directory `/home/adl/tmp'
-source='foo.c' object='foo.o' libtool=no \
-depfile='.deps/foo.Po' tmpdepfile='.deps/foo.TPo' \
-depmode=gcc /bin/sh ./depcomp \
-gcc -I. -I. -g -O2 -c `test -f 'foo.c' || echo './'`foo.c
-gcc -g -O2 -o foo foo.o
+test -d .deps || mkdir -p .deps
+gcc ... -I. -g -O2 -MT foo.o -MD -MP -MF .deps/foo.Tpo -c -o foo.o foo.c
+mv -f .deps/foo.Tpo .deps/foo.Po
+gcc -g -O2 -o foo foo.o
make[1]: Leaving directory `/home/adl/tmp'
@end example
@@ -7300,11 +7305,10 @@ test -z "foo" || rm -f foo
rm -f *.o
% : > .deps/foo.Po # Suppress previously recorded dependencies
% make foo
-source='foo.c' object='foo.o' libtool=no \
-depfile='.deps/foo.Po' tmpdepfile='.deps/foo.TPo' \
-depmode=gcc /bin/sh ./depcomp \
-gcc -I. -I. -g -O2 -c `test -f 'foo.c' || echo './'`foo.c
-foo.c:2: bindir.h: No such file or directory
+test -d .deps || mkdir -p .deps
+gcc -I. -g -O2 -MT foo.o -MD -MP -MF .deps/foo.Tpo -c -o foo.o foo.c
+foo.c:2:20: fatal error: bindir.h: No such file or directory
+compilation terminated.
make: *** [foo.o] Error 1
@end example
@@ -8996,14 +9000,13 @@ For best results, the tests should be verbose by
default now.
@vindex TEST_LOGS
Each couple of @file{.log} and @file{.trs} files is created when the
corresponding test has completed. The set of log files is listed in
-the read-only variable @code{TEST_LOGS}, and defaults to @code{TESTS},
-with the executable extension if any (@pxref{EXEEXT}), as well as any
-suffix listed in @code{TEST_EXTENSIONS} removed, and @file{.log} appended.
-Results are undefined if a test file name ends in several concatenated
-suffixes. @code{TEST_EXTENSIONS} defaults to @file{.test}; it can be
-overridden by the user, in which case any extension listed in it must be
-constituted by a dot, followed by a non-digit alphabetic character,
-followed by any number of alphabetic characters.
+the @emph{read-only} variable @code{TEST_LOGS}, and defaults to
address@hidden, with the executable extension if any (@pxref{EXEEXT}),
+as well as any suffix listed in @code{TEST_EXTENSIONS} removed, and
address@hidden appended. @code{TEST_EXTENSIONS} defaults to @file{.test};
+it can be overridden by the user, in which case any extension listed
+in it must be constituted by a dot, followed by a non-digit alphabetic
+character, followed by any number of alphabetic characters.
@c Keep in sync with test-extensions.sh
For example, @samp{.sh}, @samp{.T} and @samp{.t1} are valid extensions,
while @samp{.x-y}, @samp{.6c} and @samp{.t.1} are not.
@@ -9019,33 +9022,52 @@ while @samp{.x-y}, @samp{.6c} and @samp{.t.1} are not.
@vindex @var{ext}_LOG_FLAGS
@vindex address@hidden
@vindex AM_LOG_FLAGS
address@hidden
For tests that match an extension @address@hidden listed in
address@hidden, you can provide a custom ``test runner'' using
-the variable @address@hidden (note the upper-case
-extension) and pass options in @address@hidden and allow
-the user to pass options in @address@hidden It will cause
-all tests with this extension to be called with this runner. For all
-tests without a registered extension, the variables @code{LOG_COMPILER},
address@hidden, and @code{LOG_FLAGS} may be used. For example,
address@hidden, you can:
address@hidden Keep in sync with parallel-tests-log-compiler-example.sh
address@hidden
address@hidden
+declare extra dependencies through @address@hidden;
address@hidden
+provide a custom ``test runner'' using @address@hidden,
+(it will be used to run all the tests with this extension);
address@hidden
+pass options to that runner through @address@hidden;
address@hidden
+allow the user to pass further options through @address@hidden
address@hidden itemize
+
address@hidden
+Similarly, for tests without a registered extension, the variables
address@hidden, @code{LOG_COMPILER}, @code{AM_LOG_FLAGS} and
address@hidden may be used for those same purposes.
+
+Let's see an example.
+
address@hidden Keep in sync with parallel-tests-logvars-example.sh
@example
TESTS = foo.pl bar.py baz
TEST_EXTENSIONS = .pl .py
+
PL_LOG_COMPILER = $(PERL)
AM_PL_LOG_FLAGS = -w
+
PY_LOG_COMPILER = $(PYTHON)
AM_PY_LOG_FLAGS = -v
+PY_LOG_DEPENDENCIES = mymod.py
+
LOG_COMPILER = ./wrapper-script
AM_LOG_FLAGS = -d
@end example
@noindent
-will invoke @samp{$(PERL) -w foo.pl}, @samp{$(PYTHON) -v bar.py},
+The above will invoke @samp{$(PERL) -w foo.pl}, @samp{$(PYTHON) -v bar.py},
and @samp{./wrapper-script -d baz} to produce @file{foo.log},
address@hidden, and @file{baz.log}, respectively. The @file{foo.trs},
address@hidden and @file{baz.trs} files will be automatically produced
-as a side-effect.
address@hidden, and @file{baz.log}, respectively, and will ensure
+the python module @file{mymod.py} is built before the @file{bar.py}
+test is run. The @file{foo.trs}, @file{bar.trs} and @file{baz.trs}
+files will be automatically produced as a side-effect.
It's important to note that, differently from what we've seen for the
serial test harness (@pxref{Parallel Test Harness}), the
@@ -9075,10 +9097,17 @@ You can set the @code{TESTS} variable. For example,
you can use a
command like this to run only a subset of the tests:
@example
-make check TESTS="foo.test bar.test"
+make check TESTS="foo.test bar.sh"
address@hidden example
+
+If @code{.test} and @code{.sh} are in @code{$(TEST_EXTENSIONS)}, the
+command above can also be shortened as:
+
address@hidden
+make check TESTS="foo bar"
@end example
-Note however that the command above will unconditionally overwrite the
+Note however that the commands above will unconditionally overwrite the
@file{test-suite.log} file, thus clobbering the recorded results
of any previous testsuite run. This might be undesirable for packages
whose testsuite takes long time to execute. Luckily, this problem can
@@ -9094,41 +9123,24 @@ will write the result of the partial testsuite runs to
the
@file{partial.log}, without touching @file{test-suite.log}.
@item
-You can set the @code{TEST_LOGS} variable. By default, this variable is
-computed at @command{make} run time from the value of @code{TESTS} as
-described above. For example, you can use the following:
-
address@hidden
-set x subset*.log; shift
-make check TEST_LOGS="foo.log $*"
address@hidden example
-
-The comments made above about @code{TEST_SUITE_LOG} overriding applies
-here too.
-
address@hidden
address@hidden RECHECK_LOGS
address@hidden AM_LAZY_CHECK
@cindex lazy test execution
-By default, the test harness removes all old per-test @file{.log} and
address@hidden files before it starts running tests to regenerate them. The
-variable @code{RECHECK_LOGS} contains the set of @file{.log} (and, by
-implication, @file{.trs}) files which are removed. @code{RECHECK_LOGS}
-defaults to @code{TEST_LOGS}, which means all tests need to be rechecked.
-By overriding this variable, you can choose which tests need to be
-reconsidered. For example, you can lazily rerun only those tests which
-are outdated, i.e., older than their prerequisite test files, by setting
-this variable to the empty value:
+By default, the test harness will run all the tests anew. By setting
+the @code{AM_LAZY_CHECK} variable to @code{"yes"}, you can instruct the
+harness to re-run only those test scripts whose @file{.log} or
address@hidden is out-of-date (or non-existent):
@example
-make check RECHECK_LOGS=
+make check AM_LAZY_CHECK=yes
@end example
+In normal circumstances, this offers a simple way to lazily rerun only
+those tests which are outdated, i.e., older than their prerequisites.
+
@item
@trindex recheck
You can ensure that all tests are rerun which have failed or passed
unexpectedly, by running @code{make recheck} in the test directory.
-This convenience target will set @code{RECHECK_LOGS} appropriately
-before invoking the main test harness.
@end itemize
@noindent
@@ -9217,15 +9229,14 @@ parallel harness remains in place; this includes:
@itemize
@item
list of test scripts defined in @code{TESTS}, and overridable at
-runtime through the redefinition of @code{TESTS} or @code{TEST_LOGS};
+runtime through the redefinition of @code{TESTS};
@item
concurrency through the use of @command{make}'s option @option{-j};
@item
per-test @file{.log} and @file{.trs} files, and generation of a summary
@file{.log} file from them;
@item
address@hidden target, @code{RECHECK_LOGS} variable, and lazy reruns
-of tests;
address@hidden target and on-demand lazy reruns of tests;
@item
inter-test dependencies;
@item
@@ -12822,7 +12833,7 @@ a debugger.
@node Reporting Bugs
@section Reporting Bugs
-Most nontrivial software has bugs. Automake is no exception. Although
+Most nontrivial software has bugs. Automake-NG is no exception. Although
we cannot promise we can or will fix a bug, and we might not even agree
that it is a bug, we want to hear about problems you encounter. Often we
agree they are bugs and want to fix them.
@@ -12831,13 +12842,11 @@ To make it possible for us to fix a bug, please
report it. In order to
do so effectively, it helps to know when and how to do it.
Before reporting a bug, it is a good idea to see if it is already known.
-You can look at the @uref{http://debbugs.gnu.org/, GNU Bug Tracker}
-and the @uref{http://lists.gnu.org/@/archive/@/html/@/bug-automake/,
-bug-automake mailing list archives} for previous bug reports. We
-previously used a
address@hidden://sourceware.org/@/cgi-bin/@/gnatsweb.pl?database=automake,
-Gnats database} for bug tracking, so some bugs might have been reported
-there already. Please do not use it for new bug reports, however.
address@hidden FIXME: we'll need a bug tracker for Automake-NG, sooner or later
...
address@hidden You can look at the @uref{http://debbugs.gnu.org/, GNU Bug
Tracker}
+You can look at the
address@hidden://lists.gnu.org/@/archive/@/html/@/automake-ng/,automake-ng
+mailing list archives} for previous bug reports.
If the bug is not already known, it should be reported. It is very
important to report bugs in a way that is useful and efficient. For
@@ -12850,9 +12859,11 @@ which can then be spent on fixing more bugs and
implementing more
features.
For a bug report, a feature request or other suggestions, please send
-email to @address@hidden This will then open a new
-bug in the @uref{http://debbugs.gnu.org/@/automake, bug tracker}. Be
-sure to include the versions of Autoconf and Automake that you use.
+email to @address@hidden
address@hidden FIXME: we'll need a bug tracker for Automake-NG, sooner or later
...
address@hidden This will then open a new bug in the
address@hidden @uref{http://debbugs.gnu.org/@/automake, bug tracker}.
+Be sure to include the versions of Autoconf and Automake-NG that you use.
Ideally, post a minimal @file{Makefile.am} and @file{configure.ac} that
reproduces the problem you encounter. If you have encountered test
suite failures, please attach the @file{tests/test-suite.log} file.
diff --git a/lib/am/check.am b/lib/am/check.am
index 8d5aa40..903dfc2 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -57,14 +57,19 @@ if %?PARALLEL_TESTS%
## of more test metadata, and the use of custom test derivers and protocols
## (among them, TAP).
-# Required to support explicit use of $(srcdir) in TESTS entries.
-# That might actually be very useful in practice, for example in usages
-# like this:
+# The names of the given tests scripts with any possible registered
+# test extension removed, as well as any leading '$(srcdir)' component
+# (if any) stripped.
+# The stripping of $(srcdir) is required to support explicit use of
+# $(srcdir) in TESTS entries. That might actually be very useful in
+# practice, for example in usages like this:
# TESTS = $(wildcard $(srcdir)/t[0-9][0-9]*.sh)
-# Removing the '$(srcdir)' in there would cause the idiom to break in
-# VPATH builds.
-am__cooked_tests = $(patsubst $(srcdir)/%,%,$(strip $(TESTS)))
-am__cooked_xfail_tests = $(patsubst $(srcdir)/%,%,$(strip $(XFAIL_TESTS)))
+# where removing the $(srcdir) from the $(wildcard) invocation would
+# cause the idiom to break in VPATH builds.
+am__get_test_bases = $(patsubst $(srcdir)/%,%,$(strip \
+$(call am__strip_suffixes, $(TEST_EXTENSIONS), \
+?!HANDLE-EXEEXT? $(1))))
+?HANDLE-EXEEXT? $(patsubst %$(EXEEXT),%,$(1)))))
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -190,69 +195,34 @@ END { \
# Restructured Text title.
am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
+# This supports runtime overriding of $(TESTS) and $(XFAIL_TESTS).
+am__test_bases = \
+ $(call am__memoize,am__test_bases,$(call am__get_test_bases,$(TESTS)))
+am__xfail_test_bases = \
+ $(call am__memoize,am__xfail_test_bases,$(call
am__get_test_bases,$(XFAIL_TESTS)))
-# Default flags passed to test drivers.
-am__common_driver_flags = \
- --color-tests "$$am__color_tests" \
- --enable-hard-errors "$$am__enable_hard_errors" \
- --expect-failure "$$am__expect_failure"
+# The $(strip) is to work around the GNU make 3.80 bug where trailing
+# whitespace in "TESTS = foo.test $(empty)" causes $(TESTS_LOGS) to
+# erroneously expand to "foo.log .log".
+am__test_results = \
+ $(call am__memoize,am__test_results,$(addsuffix .trs,$(strip
$(am__test_bases))))
+am__test_logs = \
+ $(call am__memoize,am__test_logs,$(addsuffix .log,$(strip
$(am__test_bases))))
-# To be inserted before the command running the test. Creates the
-# directory for the log if needed. Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log. Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup); \
-$(am__tty_colors); \
-srcdir=$(srcdir); export srcdir; \
-test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?; \
-f='$(patsubst $(srcdir)/%,%,$<)'; \
-## We need to invoke the test in way that won't cause a PATH search.
-## Quotes around '$<' are required to avoid extra errors when a circular
-## dependency is detected (e.g., because $(TEST_SUITE_LOG) is in
-## $(TEST_LOGS)), because in that case '$<' expands to empty and an
-## unquote usage of it could cause syntax errors in the shell.
-case '$<' in */*) tst='$<';; *) tst=./'$<';; esac; \
-if test -n '$(DISABLE_HARD_ERRORS)'; then \
- am__enable_hard_errors=no; \
-else \
- am__enable_hard_errors=yes; \
-fi; \
-case " $(am__cooked_xfail_tests) " in \
- *" $$f "*) am__expect_failure=yes;; \
- *) am__expect_failure=no;; \
-esac; \
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# $(TEST_LOGS) is a published interface.
+TEST_LOGS = $(am__test_logs)
-# The names of the tests scripts with any registered extension removed
-# (i.e., equivalently, the names of the test logs, with the '.log' suffix
-# stripped), and the name of the test result files (i.e., equivalently, the
-# names of the test logs, with the '.log' suffix substituted by the '.trs'
-# suffix). This honors runtime overriding of TESTS and TEST_LOGS. It
-# also works around the GNU make 3.80 bug where trailing whitespace in
-# "TESTS = foo.test $(empty)" causes $(TESTS_LOGS) to erroneously expand
-# to "foo.log .log".
-am__TEST_BASES = $(patsubst %.log,%,$(strip $(TEST_LOGS)))
-am__TEST_RESULTS = $(patsubst %.log,%.trs,$(strip $(TEST_LOGS)))
-
-$(TEST_SUITE_LOG): $(TEST_LOGS) $(am__TEST_RESULTS)
+$(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results)
@$(am__sh_e_setup); $(am__tty_colors); \
fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \
## Detect a possible circular dependency, and error out.
- case ' $(strip $(TEST_LOGS)) ' in *' $(TEST_SUITE_LOG) '*) \
+ case ' $(strip $(am__test_logs)) ' in *' $(TEST_SUITE_LOG) '*) \
fatal "depends on itself (check TESTS content)";; \
esac; \
ws='[ ]'; \
count_result () \
{ \
- r='$(strip $(am__TEST_RESULTS))'; \
+ r='$(strip $(am__test_results))'; \
r=`grep "^$$ws*:test-result:$$ws*$${1-}" $$r </dev/null`; \
## Catch I/O errors, and complain accordingly.
test $$? -le 1 || fatal "I/O error reading test results"; \
@@ -326,7 +296,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) $(am__TEST_RESULTS)
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
- bases='$(am__TEST_BASES)'; \
+ bases='$(am__test_bases)'; \
for b in $$bases; do echo $$b; done \
| $(am__create_global_log); \
} >$(TEST_SUITE_LOG).tmp; then \
@@ -360,26 +330,18 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) $(am__TEST_RESULTS)
fi; \
$$success || exit 1
-RECHECK_LOGS = $(TEST_LOGS)
-
## ------------------------------------------ ##
## Running all tests, or rechecking failures. ##
## ------------------------------------------ ##
-check-TESTS recheck:
-## If we are running "make recheck", it's not the user which can decide
-## which tests to consider for re-execution, so we must ignore the value
-## of $(RECHECK_LOGS).
-## Here and below, we expand $(RECHECK_LOGS) only once, to avoid exceeding
-## line length limits.
- @if test $@ != recheck; then \
- list='$(RECHECK_LOGS)'; \
- test -z "$$list" || rm -f $$list; \
- fi
- @if test $@ != recheck; then \
- list='$(RECHECK_LOGS:.log=.trs)'; \
- test -z "$$list" || rm -f $$list; \
- fi
+am__remove_if_not_lazy_check = \
+## Expand the given list only once, to avoid exceeding line length limits.
+ $(if $(filter yes,$(AM_LAZY_CHECK)),, \
+ list='$(strip $(1))'; test -z "$$list" || rm -f $$list)
+
+check-TESTS:
+ @$(call am__remove_if_not_lazy_check,$(am__test_results))
+ @$(call am__remove_if_not_lazy_check,$(am__test_logs))
## We always have to remove TEST_SUITE_LOG, to ensure its rule is run
## in any case even in lazy mode: otherwise, if no test needs rerunning,
## or a prior run plus reruns all happen within the same timestamp (can
@@ -387,36 +349,24 @@ check-TESTS recheck:
## OTOH, this means that, in the rule for '$(TEST_SUITE_LOG)', we
## cannot use '$?' to compute the set of lazily rerun tests, lest
## we rely on .PHONY to work portably.
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
- @bases='$(am__TEST_BASES)'; \
- if test $@ = recheck; then \
-## If running a "make recheck", we must only consider tests that had an
-## unexpected outcome (FAIL or XPASS) in the earlier run.
- bases=`for i in $$bases; do echo $$i; done \
- | $(am__list_recheck_tests)` || exit 1; \
- fi; \
- log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-## Remove newlines and normalize whitespace.
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-## Under "make recheck", remove the .log and .trs files associated
-## with the files to recheck, so that those will be rerun by the
-## "make test-suite.log" recursive invocation below. But use a proper
-## hack to avoid extra files removal when running under "make -n".
- if test $@ != recheck || $(am__make_dryrun); then :; else \
- test -z "$$log_list" || rm -f $$log_list; \
- test -z "$$trs_list" || rm -f $$trs_list; \
- fi; \
- $(MAKE) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"
+ @rm -f $(TEST_SUITE_LOG)
+ $(MAKE) $(TEST_SUITE_LOG)
## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
## It must also depend on the 'all' target. See automake bug#11252.
recheck: all %CHECK_DEPS%
+ @bases='$(am__test_bases)'; \
+## If running a "make recheck", we must only consider tests that had an
+## unexpected outcome (FAIL or XPASS) in the earlier run.
+ bases=`for i in $$bases; do echo $$i; done \
+ | $(am__list_recheck_tests)` || exit 1; \
+## Remove newlines and normalize whitespace.
+ bases=`echo $$bases`; \
+ $(MAKE) check-TESTS am__test_bases="$$bases"
+.PHONY: recheck
AM_RECURSIVE_TARGETS += check recheck
-.PHONY: recheck
-
else !%?PARALLEL_TESTS%
check-TESTS: $(TESTS)
diff --git a/lib/am/check2.am b/lib/am/check2.am
index 19aef63..486944c 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -15,32 +15,54 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>.
if %?FIRST%
+
+am__is_xfail_test = \
+ $(if $(filter-out $(am__xfail_test_bases), \
+ $(patsubst $(srcdir)/%,%,$(1))),no,yes)
am__runtest = \
- $(am__check_pre) \
- $($(1)LOG_DRIVER) \
- --test-name "$$f" \
- --log-file $*.log \
- --trs-file $*.trs \
- $(am__common_driver_flags) \
- $(AM_$(1)LOG_DRIVER_FLAGS) \
- $($(1)LOG_DRIVER_FLAGS) \
- -- \
- $($(1)LOG_COMPILER) \
- $(AM_$(1)LOG_FLAGS) \
- $($(1)LOG_FLAGS) \
- "$$tst" \
+ $(am__sh_e_setup); \
+ $(am__tty_colors); \
+ srcdir=$(srcdir); export srcdir; \
+## Creates the directory for the log if needed.
+ test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?; \
+## We need to invoke the test in way that won't cause a PATH search.
+## Quotes around '$<' are required to avoid extra errors when a circular
+## dependency is detected (e.g., because $(TEST_SUITE_LOG) is in
+## $(am__test_logs)), because in that case '$<' expands to empty and an
+## unquote usage of it could cause syntax errors in the shell.
+ case '$<' in */*) tst='$<';; *) tst=./'$<';; esac; \
+## Executes the developer-defined and user-defined test
+## setups (if any), in that order.
+ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
+ $($(1)LOG_DRIVER) \
+ --test-name '$(patsubst $(srcdir)/%,%,$<)' \
+ --log-file $*.log \
+ --trs-file $*.trs \
+ --color-tests "$$am__color_tests" \
+ --enable-hard-errors $(if $(DISABLE_HARD_ERRORS),no,yes) \
+ --expect-failure $(call am__is_xfail_test,$*)
\
+ $(AM_$(1)LOG_DRIVER_FLAGS) \
+ $($(1)LOG_DRIVER_FLAGS) \
+ -- \
+ $($(1)LOG_COMPILER) \
+ $(AM_$(1)LOG_FLAGS) \
+ $($(1)LOG_FLAGS) \
+ "$$tst" \
$(AM_TESTS_FD_REDIRECT)
+
endif %?FIRST%
## From a test file to a .log and .trs file.
-%.log %.trs: %%EXT%
+%.log %.trs: %%EXT% $(%PFX%LOG_DEPENDENCIES)
@$(call am__runtest,%PFX%)
## If no programs are built in this package, then this rule is removed
-## at automake time. Otherwise, %am__EXEEXT% expands to a configure time
-## conditional, true if $(EXEEXT) is nonempty, thus this rule does not
-## conflict with the previous one.
-if %am__EXEEXT%
-%.log %.trs: %%EXT%$(EXEEXT)
+## at automake time.
+if %HANDLE-EXEEXT%
+## FIXME: spurious indentnation to avoid Automake thinking this is an
+## automake conditional.
+ ifdef EXEEXT
+%.log %.trs: %%EXT%$(EXEEXT) $(%PFX%LOG_DEPENDENCIES)
@$(call am__runtest,%PFX%)
-endif %am__EXEEXT%
+ endif
+endif %HANDLE-EXEEXT%
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index d620c89..10ff773 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -20,6 +20,11 @@ VPATH = @srcdir@
## position it is declared in the output Makefile.
.DEFAULT_GOAL := all
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+
## Emulate VPATH rewrites. This uses only GNU make primitives, which
## allows us to avoid extra forks.
am__vpath_rewrite = \
@@ -98,6 +103,21 @@ am__uniq = $(strip \
am__memoize = $(or $(am__memoized_value/$1),$(strip \
$(eval am__memoized_value/$1 := $$2))$(am__memoized_value/$1))
+## $(call am__strip_suffixes, SUFFIXES, LIST)
+## ------------------------------------------
+## Strip any of the SUFFIXES from each of the entries of LIST. Even if an
+## entry of LIST terminates with several suffixes, only one is stripped:
+## the first one that matches.
+am__private_suffix = .,;&!@
+am__strip_suffixes = $(strip \
+ $(if \
+ $(strip $1), \
+ $(patsubst %$(am__private_suffix),%, \
+ $(call am__strip_suffixes, \
+ $(call am__strip_firstword,$1), \
+ $(patsubst %$(firstword $1),%$(am__private_suffix),$2))), \
+ $2))
+
## Some derived variables that have been found to be useful.
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 4f2495c..c930f20 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -32,8 +32,7 @@ am__dist_common += %VTEXI% %STAMPVTI%
## should never be dependent upon a non-distributed built file.
## Therefore we ensure that %DIRSTAMP% exists in the rule.
?DIRSTAMP? test -f %DIRSTAMP% || $(MAKE) %DIRSTAMP%
- @(dir=.; test -f ./%TEXI% || dir=$(srcdir); \
- set `$(SHELL) %MDDIR%mdate-sh $$dir/%TEXI%`; \
+ @(set `$(SHELL) %MDDIR%mdate-sh $<`; \
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 73abd1f..088b857 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -42,10 +42,7 @@
done; \
else :; fi && \
?INSRC? cd "$$am__cwd"; \
- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
-?!INSRC? -o $@ `test -f '%SOURCE_INFO%' || echo
'$(srcdir)/'`%SOURCE_INFO%; \
-?INSRC??!GENERIC_INFO? -o $@ $(srcdir)/%SOURCE_INFO%; \
-?INSRC??GENERIC_INFO? -o $@ $<; \
+ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% -o
$@ $<; \
then \
rc=0; \
?INSRC? $(am__cd) $(srcdir); \
@@ -65,14 +62,12 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## Must set MAKEINFO like this so that version.texi will be found even
## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)
%MAKEINFOFLAGS%' \
-## Do not use '-o' unless necessary: it is only supported since Texinfo 4.1.
## texi2dvi doesn't silence everything with -q, redirect to /dev/null instead.
## We still want -q (%TEXIQUIET%) because it turns on batch mode.
## Use '--clean' to avoid leaving auxiliary files behind cluttering the build
## directory (see automake bug#11146). We should start using '--tidy' when we
## can assume Texinf 4.9 or later.
-?GENERIC? $(TEXI2DVI) %TEXIQUIET% --clean %SOURCE% %TEXIDEVNULL%
-?!GENERIC? $(TEXI2DVI) %TEXIQUIET% --clean -o $@ `test -f '%SOURCE%' ||
echo '$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
+ $(TEXI2DVI) %TEXIQUIET% --clean -o $@ $< %TEXIDEVNULL%
?GENERIC?%.pdf: %%SOURCE_SUFFIX%
?!GENERIC?%DEST_PREFIX%.pdf: %SOURCE% %DEPS% %DIRSTAMP%
@@ -80,14 +75,12 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## Must set MAKEINFO like this so that version.texi will be found even
## if it is in srcdir (-I $(srcdir) is set in %MAKEINFOFLAGS%).
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)
%MAKEINFOFLAGS%' \
-## Do not use '-o' unless necessary: it is only supported since Texinfo 4.1.
## texi2pdf doesn't silence everything with -q, redirect to /dev/null instead.
## We still want -q (%TEXIQUIET%) because it turns on batch mode.
## Use '--clean' to avoid leaving auxiliary files behind cluttering the build
## directory (see automake bug#11146). We should start using '--tidy' when we
## can assume Texinf 4.9 or later.
-?GENERIC? $(TEXI2PDF) %TEXIQUIET% --clean %SOURCE% %TEXIDEVNULL%
-?!GENERIC? $(TEXI2PDF) %TEXIQUIET% --clean -o $@ `test -f '%SOURCE%' ||
echo '$(srcdir)/'`%SOURCE% %TEXIDEVNULL%
+ $(TEXI2PDF) %TEXIQUIET% --clean -o $@ $< %TEXIDEVNULL%
?GENERIC?%.html: %%SOURCE_SUFFIX%
?!GENERIC?%DEST_PREFIX%.html: %SOURCE% %DEPS% %DIRSTAMP%
@@ -98,9 +91,8 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
## is to build under a temporary name, and replace the target on
## success.
%AM_V_MAKEINFO%rm -rf $(@:.html=.htp)
- %SILENT%if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS)
%MAKEINFOFLAGS% \
-?GENERIC? -o $(@:.html=.htp) %SOURCE%; \
-?!GENERIC? -o $(@:.html=.htp) `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%; \
+ %SILENT%if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) \
+ %MAKEINFOFLAGS% -o $(@:.html=.htp) $<; \
then \
rm -rf $@; \
## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/
diff --git a/m4/init.m4 b/m4/init.m4
index 469a19b..21983e9 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -107,20 +107,7 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
[m4_define([AC_PROG_OBJCXX],
m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+AC_REQUIRE([AM_SILENT_RULES])])
# When config.status generates a header, we must update the stamp-h file.
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 9f108ee..9804378 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -64,6 +64,10 @@ sc_no_am_makeflags \
sc_no_DISTFILES \
sc_no_DIST_COMMON \
sc_no_DIST_SOURCES \
+sc_no_am_TEST_BASES \
+sc_no_am_TEST_RESULTS \
+sc_no_am_TEST_LOGS \
+sc_no_RECHECK_LOGS \
sc_tests_no_make_e \
sc_docs_no_make_e \
sc_make_simple_include \
@@ -319,6 +323,35 @@ sc_no_DISTFILES sc_no_DIST_COMMON sc_no_DIST_SOURCES:
sc_no_% :
exit 1; \
fi
+sc_no_am_TEST_BASES sc_no_am_TEST_RESULTS sc_no_am_TEST_LOGS: sc_no_am_% :
+ @files="\
+ $(xtests) \
+ $(pms) \
+ $(ams) \
+ $(srcdir)/automake.in \
+ "; \
+ tolower () { LC_ALL=C tr '[A-Z]' '[a-z]'; }; \
+ if grep -F 'am__$*' $$files; then \
+ echo "'\$$(am__$*)' is obsolete and no more used." >&2; \
+ echo "You should use 'am__`echo $* | tolower`' instead." >&2; \
+ exit 1; \
+ fi
+
+sc_no_RECHECK_LOGS:
+ @files="\
+ $(xtests) \
+ $(pms) \
+ $(ams) \
+ $(srcdir)/doc/*.texi \
+ $(srcdir)/automake.in \
+ README t/README \
+ "; \
+ if grep -F 'RECHECK_LOGS' $$files; then \
+ echo "'RECHECK_LOGS' is obsolete and no more used." >&2; \
+ echo "You should use 'AM_LAZY_CHECK' instead." >&2; \
+ exit 1; \
+ fi
+
## "make -e" is brittle and unsafe, since it let *all* the environment
## win over the macro definitions in the Makefiles. We needed it when
## we couldn't assume GNU make, but now that the tide has turned, it's
@@ -465,7 +498,7 @@ sc_tests_no_configure_in:
## Rule to ensure that the testsuite has been run before. We don't depend
## on 'check' here, because that would be very wasteful in the common case.
-## We could run "make check RECHECK_LOGS=" and avoid toplevel races with
+## We could run "make check AM_LAZY_CHECK=yes" and avoid toplevel races with
## AM_RECURSIVE_TARGETS. Suggest keeping test directories around for
## greppability of the Makefile.in files.
sc_ensure_testsuite_has_run:
diff --git a/t/README b/t/README
index f1cdc5f..8628f1e 100644
--- a/t/README
+++ b/t/README
@@ -27,7 +27,7 @@ Running the tests
To run only tests that are newer than their last results:
- make -k check RECHECK_LOGS=
+ make -k check AM_LAZY_CHECK=yes
To run only selected tests:
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
index c2d3d53..87fcade 100755
--- a/t/check-concurrency-bug9245.sh
+++ b/t/check-concurrency-bug9245.sh
@@ -49,7 +49,7 @@ for j in '' -j1 -j2; do
$MAKE $j TESTS=foo.test check && Exit 1
if test x"$am_parallel_tests" = x"yes"; then
$MAKE $j recheck && Exit 1
- $MAKE $j TEST_LOGS=foo.log check && Exit 1
+ $MAKE $j TESTS=foo check && Exit 1
rm -f test-suite.log
$MAKE $j test-suite.log && Exit 1
test -f test-suite.log || Exit 1
diff --git a/t/color2.sh b/t/color2.sh
index d03c6a2..4e6862a 100755
--- a/t/color2.sh
+++ b/t/color2.sh
@@ -107,7 +107,7 @@ test_no_color ()
}
cat >expect-make <<'END'
-eval spawn $env(MAKE) -e check
+eval spawn $env(MAKE) check
expect eof
END
diff --git a/t/internals.tap b/t/internals.tap
index 6efc96f..f6ea954 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -19,7 +19,7 @@
am_create_testdir=empty
. ./defs || Exit 1
-plan_ 3
+plan_ 4
cp "$am_amdir"/header-vars.am . \
|| fatal_ "fetching makefile fragment headers-vars.am"
@@ -29,6 +29,8 @@ cp "$am_amdir"/header-vars.am . \
LC_ALL=C $EGREP -v '(^##|address@hidden@)' header-vars.am > defn.mk
rm -f header-vars.am
+# WARNING: there are a lot of embedded tabs in this makefile.
+# DO NOT "NORMALIZE" THEM TO SPACES!
cat > Makefile << 'END'
include ./defn.mk
@@ -72,10 +74,41 @@ test-uniq:
test '$(call am__uniq,3 1 1 4 1 4 1 1)' = '3 1 4'
test '$(call am__uniq, 1 3 1 )' = '1 3'
+.PHONY: test-strip-suffixes
+test-strip-suffixes:
+ test '$(call am__strip_suffixes,,)' = ''
+ test '$(call am__strip_suffixes, ,)' = ''
+ test '$(call am__strip_suffixes,, )' = ''
+ test '$(call am__strip_suffixes, , )' = ''
+ test '$(call am__strip_suffixes,x,)' = ''
+ test '$(call am__strip_suffixes,x y, )' = ''
+ test '$(call am__strip_suffixes,,x y)' = 'x y'
+ test '$(call am__strip_suffixes, ,x y)' = 'x y'
+ test '$(call am__strip_suffixes,.c,foo.c)' = 'foo'
+ test '$(call am__strip_suffixes,.foo,a.foo b.foo)' = 'a b'
+ test '$(call am__strip_suffixes, x y, ax ay ax)' = 'a a a'
+ test '$(call am__strip_suffixes,x,ax)' = 'a'
+ test '$(call am__strip_suffixes,x,xa)' = 'xa'
+ test '$(call am__strip_suffixes,x,xx)' = 'x'
+ test '$(call am__strip_suffixes,x,xux)' = 'xu'
+ test '$(call am__strip_suffixes, .c .c++, \
+ foo.c bar.c++ baz.cxx zap.c)' = 'foo bar baz.cxx zap'
+ test '$(call am__strip_suffixes, .a .b, \
+ 1.a.a 2.a.b 3.b.a 4.b.b)' = '1.a 2.a 3.b 4.b'
+ # Corner cases: the *first* matched suffix is stripped
+ test '$(call am__strip_suffixes,.a .b,x.a.a)' = 'x.a'
+ test '$(call am__strip_suffixes,.a .b,x.a.b)' = 'x.a'
+ test '$(call am__strip_suffixes,.a .b,x.b.a)' = 'x.b'
+ test '$(call am__strip_suffixes,.a .b,x.b.b)' = 'x.b'
+ test '$(call am__strip_suffixes, .a .b.a, foo.b.a bar.a)' \
+ = 'foo.b bar'
+ test '$(call am__strip_suffixes, .b.a .a, foo.b.a bar.a)' \
+ = 'foo bar'
END
-command_ok_ "am__strip_firstword" $MAKE test-strip-firstword
-command_ok_ "am__strip_lastword" $MAKE test-strip-lastword
-command_ok_ "am__uniq" $MAKE test-uniq
+command_ok_ am__strip_firstword $MAKE test-strip-firstword
+command_ok_ am__strip_lastword $MAKE test-strip-lastword
+command_ok_ am__uniq $MAKE test-uniq
+command_ok_ am__test_strip_suffixes $MAKE test-strip-suffixes
:
diff --git a/t/parallel-tests-cmdline-override.sh
b/t/parallel-tests-cmdline-override.sh
deleted file mode 100755
index 7d219e9..0000000
--- a/t/parallel-tests-cmdline-override.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check that we can use indirections when overriding TESTS and
-# TEST_LOGS from the command line.
-
-am_parallel_tests=yes
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TEST_EXTENSIONS = .test .t
-TEST_LOG_COMPILER = cat
-T_LOG_COMPILER = cat
-TESTS = bad.test
-var1 = b.test $(var2)
-var2 = c.test
-var3 = d.d
-var4 = e
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-rm -f config.log # Do not create false positives below.
-
-cat > exp-log <<'END'
-a.log
-b.log
-c.log
-d.log
-e.log
-test-suite.log
-END
-
-cat > exp-out <<'END'
-PASS: a.t
-PASS: b.test
-PASS: c.test
-PASS: d.t
-PASS: e.test
-END
-
-do_check ()
-{
- $MAKE "$@" check >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep '^PASS:' stdout | LC_ALL=C sort > got-out
- cat got-out
- ls . | grep '\.log$' | LC_ALL=C sort > got-log
- cat got-log
- st=0
- diff exp-out got-out || st=1
- diff exp-log got-log || st=1
- return $st
-}
-
-tests='a.t $(var1) $(var3:.d=.t) $(var4:=.test)'
-test_logs='a.log $(var1:.test=.log) $(var3:.d=.log) $(var4:=.log)'
-
-touch a.t b.test c.test d.t e.test
-
-do_check TESTS="$tests"
-do_check TEST_LOGS="$test_logs"
-
-:
diff --git a/t/parallel-tests-concatenated-suffix.sh
b/t/parallel-tests-concatenated-suffix.sh
new file mode 100755
index 0000000..0791222
--- /dev/null
+++ b/t/parallel-tests-concatenated-suffix.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# The parallel-tests driver should be able to cope with test scripts
+# whose names end with several concatenated suffixes.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac << 'END'
+AC_OUTPUT
+END
+
+tests='foo.sh foo.t.sh foo.sh.t foo.x.x foo.x.t.sh foo.t.x.sh foo.sh.t.x'
+
+for t in $tests; do
+ (echo '#!/bin/sh' && echo 'echo == /$0 ==') > $t
+ chmod a+x $t
+done
+
+cat > Makefile.am <<END
+TEST_EXTENSIONS = .t .sh .x
+TESTS = $tests
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+for j in '' -j4; do
+
+ # Use append mode here to avoid dropping output. See automake bug#11413.
+ # Also, use 'echo' here to "nullify" the previous contents of 'stdout',
+ # since Solaris 10 /bin/sh would try to optimize a ':' away after the
+ # first iteration, even if it is redirected.
+ echo " " >stdout
+ $MAKE $j check >>stdout || { cat stdout; Exit 1; }
+ cat stdout
+ count_test_results total=7 pass=7 fail=0 skip=0 xfail=0 xpass=0 error=0
+ for t in $tests; do grep "^PASS: $t *$" stdout; done
+
+ grep '== .*/foo\.sh ==' foo.log
+ grep '== .*/foo\.t\.sh ==' foo.t.log
+ grep '== .*/foo\.sh\.t ==' foo.sh.log
+ grep '== .*/foo\.x\.x ==' foo.x.log
+ grep '== .*/foo\.x\.t\.sh ==' foo.x.t.log
+ grep '== .*/foo\.t\.x\.sh ==' foo.t.x.log
+ grep '== .*/foo\.sh\.t\.x ==' foo.sh.t.log
+
+ $MAKE $j clean
+ test ! -f foo.log
+ test ! -f foo.t.log
+ test ! -f foo.sh.log
+ test ! -f foo.x.log
+ test ! -f foo.x.t.log
+ test ! -f foo.t.x.log
+ test ! -f foo.sh.t.log
+
+done
+
+:
diff --git a/t/parallel-tests-dynamic.sh b/t/parallel-tests-dynamic.sh
index 3b4fcb9..b94fd16 100755
--- a/t/parallel-tests-dynamic.sh
+++ b/t/parallel-tests-dynamic.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check that dynamic content for $(TESTS) and $(TEST_LOGS) is
-# supported.
+# Check that dynamic content for $(TESTS) is supported, both when set from
+# inside the Makefile.am and when overriddend from the command line.
am_parallel_tests=yes
. ./defs || Exit 1
@@ -124,22 +124,21 @@ grep '^XFAIL: t98S\.sh' stdout
$MAKE mostlyclean
test "`find . -name *.log`" = ./config.log
-# We can also override $(TEST_LOGS) dynamically.
-$MAKE check TEST_LOGS='$(shell echo t00 | sed "s/$$/-foo.log/") t99.log'
+$MAKE check TESTS='$(shell echo t00 | sed "s/$$/-foo/") t99'
test -f t00-foo.log
test -f t99.log
-# A little tricky in that we rely on the .log files created by
-# the previous run to be present.
-$MAKE check TEST_LOGS="\
- \$(wildcard t[0-9]*.log) \
- \$(call my_add_dirprefix, t, nosuffix).log \
-" > stdout || { cat stdout; Exit 1; }
+$MAKE check \
+ foo='E9E9E' \
+ a='t00.err' \
+ b='${a:.err=-foo}' \
+ TESTS='$(b) t$(subst E,,$(foo)) $(call my_add_dirprefix,t,nosuffix)' \
+ > stdout || { cat stdout; Exit 1; }
cat stdout
count_test_results total=3 pass=2 fail=0 xpass=0 xfail=1 skip=0 error=0
-grep '^PASS: t00-foo\.sh' stdout
grep '^PASS: t/nosuffix' stdout
+grep '^PASS: t00-foo\.sh' stdout
grep '^XFAIL: t99\.sh' stdout
:
diff --git a/t/parallel-tests-empty-testlogs.sh
b/t/parallel-tests-empty-tests.sh
similarity index 90%
rename from t/parallel-tests-empty-testlogs.sh
rename to t/parallel-tests-empty-tests.sh
index c49a412..f16095b 100755
--- a/t/parallel-tests-empty-testlogs.sh
+++ b/t/parallel-tests-empty-tests.sh
@@ -14,9 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Check parallel-tests features:
-# - empty TESTS
-# - empty TEST_LOGS
+# Check parallel-tests features: empty TESTS
am_parallel_tests=yes
. ./defs || Exit 1
@@ -35,7 +33,8 @@ mkdir sub1 sub2
cat > sub1/Makefile.am << 'END'
TESTS =
check-local:
- echo $(TEST_LOGS) | grep . && exit 1; exit 0
+ echo $(am__test_logs) $(am__test_results) $(am__test_bases) \
+ | grep . && exit 1; exit 0
END
cat > sub2/Makefile.am << 'END'
@@ -74,8 +73,6 @@ for vpath in : false; do
cd ../sub2
$MAKE check VERBOSE=yes TESTS=''
no_test_has_run
- $MAKE check VERBOSE=yes TEST_LOGS=''
- no_test_has_run
cd ..
$MAKE check
cat sub2/foo.log
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
index ac94533..1a3a788 100755
--- a/t/parallel-tests-exeext.sh
+++ b/t/parallel-tests-exeext.sh
@@ -22,11 +22,8 @@ am_parallel_tests=yes
cat >> configure.ac << 'END'
dnl We need to fool the init.m4 internals a little.
-AC_DEFUN([_AM_FOO],
- [m4_provide([_AM_COMPILER_EXEEXT])
- AC_SUBST([CC], [false])
- AC_SUBST([EXEEXT])])
-_AM_FOO
+AC_SUBST([CC], [false])
+AC_SUBST([EXEEXT])
AC_OUTPUT
END
@@ -61,4 +58,15 @@ test ! -r y.bin.log
test -f b.log
test ! -r b.test.log
+# Opportunistically check that we are not forced to specify
+# the test suffixes nor the $(EXEEXT) suffix when overriding
+# TESTS on the command line.
+rm -f *.log *.trs
+
+$MAKE check TESTS='y a b'
+ls -l # For debugging.
+test -f a.log
+test -f b.log
+test -f y.log
+
:
diff --git a/t/parallel-tests-extra-programs.sh
b/t/parallel-tests-extra-programs.sh
index a42bb5d..4137998 100755
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.sh
@@ -90,7 +90,7 @@ int main (void)
END
# 4. A program that is also a test, but whose source files
-# do not exit and are not buildable by make.
+# do not exist and are not buildable by make.
cat >> Makefile.am <<'END'
EXTRA_PROGRAMS += none.bin
@@ -152,7 +152,7 @@ $sleep
echo 'int main (void) { return 0; }' > none.c
st=0
-$MAKE check RECHECK_LOGS= >stdout || st=$?
+$MAKE check AM_LAZY_CHECK=yes >stdout || st=$?
cat stdout
ls -l
test $st -eq 0 || Exit 1
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index a4e9253..e1c2282 100755
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -80,8 +80,7 @@ rm -f *.log *.test
: > 2.test
: > 3.test
: > foobar.test
-do_check foobar.log TEST_LOGS='0.log 1.log foobar.log 2.log 3.log' \
- TEST_SUITE_LOG=foobar.log
+do_check foobar.log TESTS='0 1 foobar 2 3' TEST_SUITE_LOG=foobar.log
rm -f *.log *.test
:
diff --git a/t/parallel-tests-log-override-2.sh
b/t/parallel-tests-log-override-2.sh
deleted file mode 100755
index 3c11c9c..0000000
--- a/t/parallel-tests-log-override-2.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features: runtime redefinition of:
-# - $(TEST_SUITE_LOG) and $(TESTS)
-# - $(TEST_SUITE_LOG) and $(TEST_LOGS)
-
-am_parallel_tests=yes
-. ./defs || Exit 1
-
-cat >> configure.ac <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = pass.test pass2.test skip.test skip2.test fail.test
-END
-
-cat > pass.test <<'END'
-#! /bin/sh
-exit 0
-END
-
-cp pass.test pass2.test
-
-cat > skip.test <<'END'
-#! /bin/sh
-echo "% skipped test %"
-exit 77
-END
-
-cp skip.test skip2.test
-
-cat > fail.test <<'END'
-#! /bin/sh
-exit 1
-END
-
-chmod a+x *.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-# Extra quoting for the sake of Solaris sh bugs.
-for test_list_override in \
- 'TESTS=pass.test skip.test' \
- 'TEST_LOGS=pass.log skip.log'
-do
- eval "\$MAKE TEST_SUITE_LOG=partial.log '$test_list_override'" \
- check >stdout || { cat stdout; Exit 1; }
- cat stdout
- ls -l
- count_test_results total=2 pass=1 fail=0 skip=1 xfail=0 xpass=0 error=0
- cat pass.log
- cat skip.log
- cat partial.log
- test ! -f test-suite.log
- test ! -f pass2.log
- test ! -f skip2.log
- test ! -f fail.log
- grep '^PASS: pass\.test$' stdout
- grep '^SKIP: skip\.test$' stdout
- $FGREP 'SKIP: skip' partial.log
- $FGREP '% skipped test %' partial.log
- $EGREP '(pass2|skip2|fail)\.test' stdout && Exit 1
- $EGREP '(pass2|skip2|fail)' partial.log && Exit 1
- rm -f *.log
-done
-
-:
diff --git a/t/parallel-tests-log-override-recheck.sh
b/t/parallel-tests-log-override-recheck.sh
deleted file mode 100755
index 04e3768..0000000
--- a/t/parallel-tests-log-override-recheck.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG)
-# for the recheck target.
-
-am_parallel_tests=yes
-. ./defs || Exit 1
-
-cat >> configure.ac <<'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am <<'END'
-TESTS = foofoo.test barbar.test bazbaz.test
-END
-
-cat > foofoo.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 0
-END
-
-cat > barbar.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit 99
-END
-
-cat > bazbaz.test <<'END'
-#! /bin/sh
-echo "this is $0"
-exit ${BAZ_EXIT_STATUS-1}
-END
-
-chmod a+x *.test
-
-unset BAZ_EXIT_STATUS || :
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-# Filter make output before grepping it, for make implementations that,
-# like Solaris' one, print the whole of the failed recipe on failure.
-filter_stdout ()
-{
- grep -v 'bases=.*;' stdout > t && mv -f t stdout
-}
-
-./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
-cat stdout
-
-chmod a-rw test-suite.log
-$MAKE TEST_SUITE_LOG=my.log recheck >stdout \
- && { cat stdout; Exit 1; }
-cat stdout
-ls -l
-filter_stdout
-count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1
-for x in stdout my.log; do
- $FGREP foofoo $x && Exit 1
- $FGREP barbar $x
- $FGREP bazbaz $x
-done
-
-chmod a-rw my.log
-$MAKE BAZ_EXIT_STATUS=0 TEST_SUITE_LOG=my2.log recheck >stdout \
- && { cat stdout; Exit 1; }
-cat stdout
-ls -l
-count_test_results total=2 pass=1 fail=0 skip=0 xfail=0 xpass=0 error=1
-filter_stdout
-$FGREP foofoo stdout && Exit 1
-$FGREP barbar stdout
-$FGREP bazbaz stdout
-$FGREP foofoo my2.log && Exit 1
-$FGREP barbar my2.log
-$FGREP bazbaz my2.log && Exit 1
-
-chmod u+r test-suite.log my.log
-$FGREP bazbaz test-suite.log
-$FGREP bazbaz my.log
-
-:
diff --git a/t/parallel-tests-log-override-1.sh
b/t/parallel-tests-log-override.sh
similarity index 100%
rename from t/parallel-tests-log-override-1.sh
rename to t/parallel-tests-log-override.sh
diff --git a/t/parallel-tests-log-compiler-example.sh
b/t/parallel-tests-logvars-example.sh
similarity index 87%
rename from t/parallel-tests-log-compiler-example.sh
rename to t/parallel-tests-logvars-example.sh
index 8b45758..fc922a5 100755
--- a/t/parallel-tests-log-compiler-example.sh
+++ b/t/parallel-tests-logvars-example.sh
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test the example of usage of generic and extension-specific
-# LOG_COMPILER and LOG_FLAGS given in the manual.
+# LOG_COMPILER, LOG_FLAGS and LOG_DEPENDNECIES given in the manual.
am_parallel_tests=yes
required=python
@@ -30,16 +30,22 @@ END
cat > Makefile.am << 'END'
TESTS = foo.pl bar.py baz
TEST_EXTENSIONS = .pl .py
+
PL_LOG_COMPILER = $(PERL)
AM_PL_LOG_FLAGS = -w
-PY_LOG_COMPILER = $(PYTHON)
-AM_PY_LOG_FLAGS = -v
+
LOG_COMPILER = ./wrapper-script
AM_LOG_FLAGS = -d
+
+PY_LOG_COMPILER = $(PYTHON)
+AM_PY_LOG_FLAGS = -v
+PY_LOG_DEPENDENCIES = mymod.py
+mymod.py:
+ echo "import sys" >$@
END
echo 'my $a =+ 2; exit (0);' > foo.pl
-echo 'import sys; sys.exit(0);' > bar.py
+echo 'import mymod; mymod.sys.exit(0);' > bar.py
: > baz
cat > wrapper-script <<'END'
@@ -59,6 +65,9 @@ $MAKE check || st=$?
cat foo.log
cat bar.log
cat baz.log
+cat foo.trs
+cat bar.trs
+cat baz.trs
test $st -eq 0 || Exit $st
# Check that the wrappers have been run with the expected flags.
diff --git a/t/parallel-tests-longest-stem.sh b/t/parallel-tests-longest-stem.sh
index 242d78f..d93685d 100755
--- a/t/parallel-tests-longest-stem.sh
+++ b/t/parallel-tests-longest-stem.sh
@@ -40,7 +40,6 @@ cp foo.test dist.test
cp foo.test install.test
cp foo.test bad-target.test
-
cat > Makefile.am << 'END'
bad-target:
@echo $@ has been run >&2; exit 1
diff --git a/t/parallel-tests-no-spurious-summary.sh
b/t/parallel-tests-no-spurious-summary.sh
deleted file mode 100755
index 62b4ef6..0000000
--- a/t/parallel-tests-no-spurious-summary.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check that ':test-results:' directives in test scripts' output doesn't
-# originate spurious results in the testsuite summary.
-
-am_parallel_tests=yes
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS = foo.test bar.test
-END
-
-cat > foo.test <<'END'
-#! /bin/sh
-echo :test-result:XFAIL
-echo :test-result: SKIP
-echo :test-result:ERROR
-exit 0
-END
-cat > bar.test <<'END'
-#! /bin/sh
-echo :test-result: ERROR
-echo :test-result:FAIL
-echo :test-result: XPASS
-exit 0
-END
-chmod a+x foo.test bar.test
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-
-st=0
-$MAKE check >stdout || st=$?
-cat stdout
-cat test-suite.log
-cat foo.log
-cat bar.log
-test $st -eq 0 || Exit $st
-
-grep '^:test-result:XFAIL$' foo.log
-grep '^:test-result: SKIP$' foo.log
-grep '^:test-result:FAIL$' bar.log
-grep '^:test-result: XPASS$' bar.log
-
-count_test_results total=2 pass=2 fail=0 skip=0 xfail=0 xpass=0 error=0
-
-:
diff --git a/t/parallel-tests-per-suffix-deps.sh
b/t/parallel-tests-per-suffix-deps.sh
new file mode 100755
index 0000000..496c9f6
--- /dev/null
+++ b/t/parallel-tests-per-suffix-deps.sh
@@ -0,0 +1,163 @@
+#! /bin/sh
+# Copyright (C) 2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# The user should be able to easily specify extra dependencies for
+# the test cases, depending on their extension (or lack thereof).
+# We do so with the help of "${prefix}LOG_DEPENDENCIES" variables.
+# See the last wishlist in automake bug#11287.
+
+am_parallel_tests=yes
+. ./defs || Exit 1
+
+cat >> configure.ac <<'END'
+AC_SUBST([EXEEXT], [.bin])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEST_EXTENSIONS = .test .sh
+TESTS = foo.test foo2.test bar.sh baz zard.oz quux.bin mu.test.bin
+
+TEST_LOG_DEPENDENCIES = test-dep
+SH_LOG_DEPENDENCIES = sh-dep1 sh-dep2
+LOG_DEPENDENCIES = dep
+
+DEPS = test-dep sh-dep1 sh-dep2 dep new-test-dep
+$(DEPS):
+ echo dummy > $@
+CLEANFILES = $(DEPS)
+
+.PHONY: setup
+setup:
+ chmod a+x $(TESTS)
+EXTRA_DIST = $(TESTS)
+END
+
+cat > foo.test <<'END'
+#! /bin/sh
+test -f test-dep || test -f new-test-dep
+END
+
+cat > foo2.test <<'END'
+#! /bin/sh
+test -f test-dep
+END
+
+cp foo2.test mu.test.bin
+
+cat > bar.sh <<'END'
+#! /bin/sh
+test -f sh-dep1 && test -f sh-dep2
+END
+
+cat > baz <<'END'
+#! /bin/sh
+test -f dep
+END
+
+cp baz quux.bin
+
+cat > zard.oz <<'END'
+#! /bin/sh
+test -f dep
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure
+
+$MAKE setup
+
+cleanup () { rm -f test-dep sh-dep1 sh-dep2 dep; }
+
+$MAKE check -j4
+test ! -f new-test-dep
+test -f test-dep
+test -f sh-dep1
+test -f sh-dep2
+test -f dep
+test -f quux.log # Sanity check.
+test -f mu.log # Likewise.
+
+cleanup
+
+$MAKE check TESTS=foo.test
+test -f test-dep
+test ! -f sh-dep1
+test ! -f sh-dep2
+test ! -f dep
+
+cleanup
+rm -f bar.log
+$MAKE check TESTS=bar.sh AM_LAZY_CHECK=yes
+test ! -f test-dep
+test -f sh-dep1
+test -f sh-dep2
+test ! -f dep
+
+cleanup
+$MAKE check TESTS=baz
+test ! -f test-dep
+test ! -f sh-dep1
+test ! -f sh-dep2
+test -f dep
+
+cleanup
+$MAKE check TESTS='foo bar'
+test -f test-dep
+test -f sh-dep1
+test -f sh-dep2
+test ! -f dep
+
+cleanup
+$MAKE check TESTS=zard.oz
+test ! -f test-dep
+test ! -f sh-dep1
+test ! -f sh-dep2
+test -f dep
+
+cleanup
+$MAKE check TESTS=mu.test.bin
+test -f test-dep
+test ! -f sh-dep1
+test ! -f sh-dep2
+test ! -f dep
+
+cleanup
+$MAKE check TESTS='quux.bin bar.sh'
+test ! -f test-dep
+test -f sh-dep1
+test -f sh-dep2
+test -f dep
+
+cleanup
+$MAKE check TESTS=foo TEST_LOG_DEPENDENCIES=new-test-dep
+test -f new-test-dep
+test ! -f test-dep
+test ! -f sh-dep1
+test ! -f sh-dep2
+test ! -f dep
+
+cleanup
+$MAKE check TESTS=baz XFAIL_TESTS=baz LOG_DEPENDENCIES=
+test ! -f dep
+grep ':test-result: XFAIL' baz.trs
+
+$MAKE distcheck
+
+:
diff --git a/t/parallel-tests.sh b/t/parallel-tests.sh
index 4861ff5..538ee75 100755
--- a/t/parallel-tests.sh
+++ b/t/parallel-tests.sh
@@ -19,9 +19,8 @@
# - log files, and what goes in 'test-suite.log'
# - make clean
# - dependencies between tests
-# - TESTS redefinition at runtime
-# - TEST_LOGS redefinition at runtime
-# - RECHECK_LOGS redefinition at runtime
+# - TESTS redefinition at runtime (with and without test suffixes)
+# - AM_LAZY_CHECK
am_parallel_tests=yes
. ./defs || Exit 1
@@ -37,19 +36,14 @@ foo.log: bar.log
bar.log: baz.log
END
-# foo.test and bar.test sleep to ensure their logs are always strictly newer
-# than the logs of their prerequisites, for HP-UX make. The quoting pleases
-# maintainer-check.
cat > foo.test <<'END'
#! /bin/sh
echo "this is $0"
-sleep '1'
exit 0
END
cat > bar.test <<'END'
#! /bin/sh
echo "this is $0"
-sleep '1'
exit 99
END
cat > baz.test <<'END'
@@ -85,9 +79,9 @@ test ! -f test-suite.log
# Check dependencies: baz.test needs to run before bar.test,
# but foo.test is not needed.
-# Note that this usage has a problem: the summary will only
-# take bar.log into account, because the $(TEST_SUITE_LOG) rule
-# does not "see" baz.log. Hmm.
+# FIXME: Note that this usage has a problem: the summary will only
+# FIXME: take bar.log into account, because the $(TEST_SUITE_LOG)
+# FIXME: rule does not "see" baz.log. Hmm.
$MAKE check TESTS=bar.test >stdout && { cat stdout; Exit 1; }
cat stdout
grep '^FAIL: baz\.test$' stdout
@@ -104,7 +98,7 @@ test -f test-suite.log
# Note that the previous test and this one taken together expose the timing
# issue that requires the check-TESTS rule to always remove TEST_SUITE_LOG
# before running the tests lazily.
-$MAKE check RECHECK_LOGS= > stdout && { cat stdout; Exit 1; }
+$MAKE check AM_LAZY_CHECK=yes > stdout && { cat stdout; Exit 1; }
cat stdout
test -f foo.log
grep '^PASS: foo\.test$' stdout
@@ -116,7 +110,7 @@ grep '^# ERROR: *1$' stdout
# Now, explicitly retry with all test logs already updated, and ensure
# that the summary is still displayed.
-$MAKE check RECHECK_LOGS= > stdout && { cat stdout; Exit 1; }
+$MAKE check AM_LAZY_CHECK=yes > stdout && { cat stdout; Exit 1; }
cat stdout
grep foo.test stdout && Exit 1
grep bar.test stdout && Exit 1
@@ -125,18 +119,8 @@ grep '^# PASS: *1$' stdout
grep '^# FAIL: *1$' stdout
grep '^# ERROR: *1$' stdout
-# Lazily rerunning only foo should only rerun this one test.
-$MAKE check RECHECK_LOGS=foo.log > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep foo.test stdout
-grep bar.test stdout && Exit 1
-grep baz.test stdout && Exit 1
-grep '^# PASS: *1$' stdout
-grep '^# FAIL: *1$' stdout
-grep '^# ERROR: *1$' stdout
-
$MAKE clean
-$MAKE check TEST_LOGS=baz.log > stdout && { cat stdout; Exit 1; }
+$MAKE check TESTS=baz > stdout && { cat stdout; Exit 1; }
cat stdout
grep foo.test stdout && Exit 1
grep bar.test stdout && Exit 1
diff --git a/t/parallel-tests6.sh b/t/parallel-tests6.sh
index 6003295..76ba596 100755
--- a/t/parallel-tests6.sh
+++ b/t/parallel-tests6.sh
@@ -20,6 +20,7 @@
am_parallel_tests=yes
. ./defs || Exit 1
+
cat >> configure.ac << 'END'
AC_OUTPUT
END
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index 2661afa..9ac0c5d 100755
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -23,7 +23,7 @@ am_create_testdir=empty
hasnt_parallel_tests ()
{
- $EGREP 'TEST_SUITE_LOG|TEST_LOGS|\.log.*:' $1 && Exit 1
+ $EGREP -i 'test_suite_log|test_(logs|bases)|\.log.*:' $1 && Exit 1
grep 'recheck.*:' $1 && Exit 1
grep '^check-TESTS: \$(TESTS)$' $1
}
@@ -32,7 +32,7 @@ has_parallel_tests ()
{
$EGREP '(^| )check-TESTS.*:' $1
$EGREP '(^| )recheck.*:' $1
- $EGREP '^\$\(TEST_SUITE_LOG\):.* \$\(TEST_LOGS\)( |$)' $1
+ $EGREP '^\$\(TEST_SUITE_LOG\):.* \$\(am__test_logs\)( |$)' $1
grep '^%.log %.trs *:.*%\.test' $1
}
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
index 417c248..a7fcd07 100755
--- a/t/tap-basic.sh
+++ b/t/tap-basic.sh
@@ -18,7 +18,7 @@
# - LOG_COMPILER support;
# - basic support for TODO and SKIP directives, and "Bail out!" magic;
# - testsuite progress output on console;
-# - runtime overriding of TESTS and TEST_LOGS;
+# - runtime overriding of TESTS;
# - correct counts of test results (both in summary and in progress
# output on console).
# Note that some of the features checked here are checked in other
@@ -144,12 +144,12 @@ grep '^PASS:' stdout && Exit 1
test `$FGREP -c ': bail.test' stdout` -eq 1
$FGREP 'success.test' stdout && Exit 1
-# Override TEST_LOGS from the command line, making it point to a test
+# Override TESTS from the command line, making it point to a test
# (ok.test) that has to be generated at make time.
rm -f *.log *.test
-$MAKE TEST_LOGS=ok.log check >stdout || { cat stdout; Exit 1; }
+$MAKE TESTS=ok check >stdout || { cat stdout; Exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=0
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 5049171..9295257 100755
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -21,7 +21,7 @@ am_parallel_tests=yes
. ./defs || Exit 1
cat > Makefile.am << 'END'
-# The tests are *deliberately* listed in inversed order here.
+# The tests are *deliberately* listed in inverted order here.
TESTS = c.test b.test a.test
b.log: a.log
c.log: b.log
diff --git a/t/tap-recheck-logs.sh b/t/tap-lazy-check.sh
similarity index 77%
rename from t/tap-recheck-logs.sh
rename to t/tap-lazy-check.sh
index 36a59ca..de92c3d 100755
--- a/t/tap-recheck-logs.sh
+++ b/t/tap-lazy-check.sh
@@ -14,8 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# TAP support:
-# - RECHECK_LOGS
+# TAP support: AM_LAZY_CHECK
am_parallel_tests=yes
. ./defs || Exit 1
@@ -47,7 +46,7 @@ Bail out!
END
# Even the tests that are not re-run should contribute to the testsuite
-# summary when obtained by "make check RECHECK_LOGS=".
+# summary when obtained by "make check AM_LAZY_CHECK=yes".
grep_summary ()
{
grep '^# TOTAL: *4$' stdout
@@ -66,7 +65,7 @@ test -f baz.log
rm -f foo.log bar.log
-$MAKE RECHECK_LOGS= check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
cat stdout
test -f foo.log
test -f bar.log
@@ -81,7 +80,7 @@ touch foo.test
# We re-run only a successful test, but the tests that failed in the
# previous run should still be taken into account, and cause an overall
# failure.
-$MAKE RECHECK_LOGS= check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
cat stdout
grep '^PASS: foo\.test 1$' stdout
grep '^PASS: foo\.test 2$' stdout
@@ -91,7 +90,7 @@ grep_summary
$sleep
touch zardoz
-$MAKE RECHECK_LOGS= check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
cat stdout
grep '^ERROR: baz\.test' stdout
$EGREP '(foo|bar)\.test' stdout && Exit 1
@@ -100,20 +99,9 @@ grep_summary
# Now, explicitly retry with all test logs already updated, and ensure
# that the summary is still displayed.
-$MAKE RECHECK_LOGS= check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
cat stdout
$EGREP '(foo|bar|baz)\.test' stdout && Exit 1
grep_summary
-# The following should re-run foo.test (and only foo.test), even if its
-# log file is up-to-date.
-: > older
-$MAKE RECHECK_LOGS=foo.log check > stdout && { cat stdout; Exit 1; }
-cat stdout
-grep '^PASS: foo\.test 1$' stdout
-grep '^PASS: foo\.test 2$' stdout
-grep 'ba[rz]\.test' stdout && Exit 1
-is_newest foo.log older
-grep_summary
-
:
diff --git a/t/tap-no-spurious-summary.sh b/t/tap-no-spurious-summary.sh
deleted file mode 100755
index 8da15e8..0000000
--- a/t/tap-no-spurious-summary.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# TAP support:
-# - ':test-results:' directives in test scripts' output doesn't
-# originate spurious results in the testsuite summary
-
-am_parallel_tests=yes
-. ./defs || Exit 1
-
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
-
-cat > all.test <<'END'
-1..1
-:test-result: PASS
-:test-result: FAIL
-:test-result: XPASS
-:test-result: XFAIL
-:test-result: SKIP
-:test-result: ERROR
-:test-result: UNKNOWN
-ok 1
-END
-
-$MAKE check >stdout || { cat stdout; Exit 1; }
-cat stdout
-
-count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
-
-for result in PASS FAIL XPASS XFAIL SKIP ERROR UNKNOWN; do
- grep "^ *:test-result: $result$" all.log
-done
-
-:
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
index e261d57..87bf12b 100755
--- a/t/tap-todo-skip.sh
+++ b/t/tap-todo-skip.sh
@@ -67,7 +67,7 @@ cat stdout
count_test_results total=256 pass=0 fail=0 xpass=0 xfail=128 skip=128 error=0
# -------------------------------------------------------- #
-# TODO ans SKIP directives aren't recognized spuriously. #
+# TODO and SKIP directives aren't recognized spuriously. #
# -------------------------------------------------------- #
cat > all.test <<'END'
diff --git a/t/test-driver-custom-multitest-recheck2.sh
b/t/test-driver-custom-multitest-recheck2.sh
index eef1043..9eb8f8d 100755
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -16,10 +16,8 @@
# Custom test drivers: try the "recheck" functionality with test protocols
# that allow multiple testcases in a single test script. In particular,
-# check that this still works when we override $(TESTS) and $(TEST_LOGS)
-# at make runtime.
-# See also related tests 'test-driver-custom-multitest-recheck.test' and
-# 'parallel-tests-recheck-override.test'.
+# check that this still works when we override $(TESTS) at make runtime.
+# See also related tests 'test-driver-custom-multitest-recheck.test'.
am_parallel_tests=yes
. ./defs || Exit 1
@@ -94,15 +92,13 @@ for vpath in : false; do
rm -f *.run
- : An empty '$(TESTS)' or '$(TEST_LOGS)' means that no test should be run.
- for var in TESTS TEST_LOGS; do
- $MAKE "$var=" recheck >stdout || { cat stdout; Exit 1; }
- cat stdout
- count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
- done
+ : An empty '$(TESTS)' means that no test should be run.
+ $MAKE TESTS= recheck >stdout || { cat stdout; Exit 1; }
+ cat stdout
+ count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
+ test ! -r a.run
+ test ! -r b.run
+ test ! -r c.run
unset var
: a.test was successful the first time, no need to re-run it.
@@ -115,7 +111,7 @@ for vpath in : false; do
: b.test failed, it should be re-run. And make it pass this time.
echo OK > b.ok
- $MAKE TEST_LOGS=b.log recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS=b recheck >stdout || { cat stdout; Exit 1; }
cat stdout
test ! -r a.run
test -f b.run
@@ -125,7 +121,7 @@ for vpath in : false; do
rm -f *.run
: No need to re-run a.test or b.test anymore.
- $MAKE TEST_LOGS=b.log recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS=b recheck >stdout || { cat stdout; Exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
test ! -r a.run
@@ -144,7 +140,7 @@ for vpath in : false; do
# Use 'echo' here, since Solaris 10 /bin/sh would try to optimize
# a ':' away after the first iteration, even if it is redirected.
echo dummy > c.err
- $MAKE TEST_LOGS='a.log c.log' recheck >stdout && { cat stdout; Exit 1; }
+ $MAKE TESTS='a.test c' recheck >stdout && { cat stdout; Exit 1; }
cat stdout
count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
test ! -r a.run
diff --git a/t/test-missing.sh b/t/test-missing.sh
index 1547962..7ede224 100755
--- a/t/test-missing.sh
+++ b/t/test-missing.sh
@@ -14,9 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# parallel-tests:
-# - non-existent scripts listed in TESTS get diagnosed
-# See also related test 'test-missing2.test'.
+# parallel-tests: non-existent scripts listed in TESTS get diagnosed.
am_parallel_tests=yes
. ./defs || Exit 1
@@ -50,7 +48,7 @@ cat stderr
$FGREP 'zardoz2.log' stderr
test ! -f test-suite.log
-$MAKE TEST_LOGS='zardoz3.log' check 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE TESTS='zardoz3' check 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
$FGREP 'zardoz3.log' stderr
test ! -f test-suite.log
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
index c988400..43e3854 100755
--- a/t/test-trs-basic.sh
+++ b/t/test-trs-basic.sh
@@ -32,10 +32,10 @@ TEST_LOG_COMPILER = $(SHELL)
SH_LOG_COMPILER = $(SHELL)
## Used to check some internal details. And yes, the quotes around
-## $(am__TESTS_BASES) are deliberate: they check for whitespace
+## $(am__tests_bases) are deliberate: they check for whitespace
## normalization.
tb:
- echo '$(am__TEST_BASES)' > $@
+ echo '$(am__test_bases)' > $@
END
cat > foo.test << 'END'
@@ -114,7 +114,7 @@ test -f unrelated.trs
test -f sub/foo.trs
#
-# Try with a subset of TESTS.
+# Try with a subset of TESTS, complete with test extensions.
#
$MAKE TESTS=foo.test check
@@ -135,22 +135,22 @@ test ! -f bar.trs
$MAKE clean
#
-# Try with a subset of TEST_LOGS.
+# Try with a subset of TESTS, omitting the test extensions.
#
-$MAKE TEST_LOGS=sub/zardoz.log check
+$MAKE TESTS=sub/zardoz check
test ! -f foo.trs
test ! -f bar.trs
test -f sub/zardoz.trs
$MAKE clean
test ! -f sub/zardoz.trs
-$MAKE TEST_LOGS='foo.log bar.log' check
+$MAKE TESTS='foo bar' check
test -f foo.trs
test -f bar.trs
test ! -f sub/zardoz.trs
-# "make clean" shouldn't remove '.trs' files for tests whose log
-# is not in $(TEST_LOGS).
-$MAKE TEST_LOGS=foo.log clean
+# "make clean" shouldn't remove '.trs' files for tests that are not
+# in is not in $(TESTS).
+$MAKE TESTS=foo clean
test ! -f foo.trs
test -f bar.trs
test ! -f sub/zardoz.trs
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
index 8acd270..25cb363 100755
--- a/t/test-trs-recover.sh
+++ b/t/test-trs-recover.sh
@@ -102,9 +102,9 @@ test -f foo.trs
test ! -f bar.trs
test ! -f baz.trs
-: Recreate with a "make check" with redefined TEST_LOGS.
+: Recreate with a "make check" with redefined suffix-less TESTS.
rm -f foo.trs bar.trs baz.trs
-$MAKE TEST_LOGS=bar.log check
+$MAKE TESTS=bar check
test ! -f foo.trs
test -f bar.trs
test ! -f baz.trs
@@ -154,7 +154,7 @@ test -f baz.trs
rm -f foo.trs
update_stamp
touch bar.test
-$MAKE RECHECK_LOGS= check >stdout || { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check >stdout || { cat stdout; Exit 1; }
cat stdout
# Check that make has updated what it needed to, but no more.
test -f foo.trs
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-245-g4afce93,
Stefano Lattarini <=