[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-354-g045e22a |
|
Date: |
Tue, 22 Mar 2011 06:19:35 +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=045e22a5195b72afebedebb0eb189abaeacf1ba7
The branch, branch-1.11 has been updated
via 045e22a5195b72afebedebb0eb189abaeacf1ba7 (commit)
via 34c1c2d884774ae91f82e1c5027d1502b3112c6a (commit)
via 32975c638af3628283ba0fe6080729acbc898acb (commit)
via e36003d0cf689ab737e774ea5faa07b2375e0d0a (commit)
via 68694a871f05fcb33a3efb6aada7c084365ca272 (commit)
via ef95da1f6a426e26b5f6b3c219ec4d27f982ffc5 (commit)
via 1325a8ada5e11f19ff41094e8c2f86fe0952e425 (commit)
via b532317d8b7f779a45a070fd10012a204cf4ee72 (commit)
via 78992b3411196a4e9e66bffed5a6ab96aa9d648f (commit)
via d51e7b79713f909c235c9880f7f62c4b0c0910d0 (commit)
via e6ca61c1a1bf601cfde4b67c33fe861cafff7450 (commit)
via a118732d1138b169e3c41759b8e3e03945994172 (commit)
via 5bf7af6e1e5fa63bc192ed972ef8c83dd6faec2b (commit)
via 5cc6a5a3835fe98b23e4dae86ba7228f977e50a2 (commit)
via 5ed043ad03d36be44500501ec0d69f3ba736911d (commit)
via e12be9450726e26136a6bc64f7df47ced18f6671 (commit)
via 9095d6b98f6d9d3755e8b592f336011aef11d61f (commit)
via 57198decf1d0dfa758d70ac564e2aec4281798d0 (commit)
via 06b46e1f8f307d2f6d0af6a9d73f7003171d0745 (commit)
from 235a1c6484de2c85324d9f263f8777b46658502e (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 045e22a5195b72afebedebb0eb189abaeacf1ba7
Merge: 235a1c6 34c1c2d
Author: Ralf Wildenhues <address@hidden>
Date: Mon Mar 21 22:14:37 2011 +0100
Merge branch 'maint' into branch-1.11
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 158 ++++++++++++++++++++
ChangeLog.03 | 6 +-
ChangeLog.96 | 30 ++--
ChangeLog.98 | 12 +-
Makefile.am | 61 ++++++++
Makefile.in | 58 +++++++
NEWS | 4 +-
THANKS | 2 +-
TODO | 6 +-
doc/automake.texi | 16 ++-
lib/Automake/Variable.pm | 2 +-
m4/python.m4 | 2 +
tests/Makefile.am | 16 ++-
tests/Makefile.in | 19 ++-
tests/alloca.test | 12 ++-
tests/alloca2.test | 12 ++-
...t-stamp-vti.test => check-exported-srcdir.test} | 55 ++++---
tests/check-tests-in-builddir.test | 83 ++++++++++
.../{check11.test => check-tests_environment.test} | 22 +--
...s-in-var-defn.test => comments-in-var-def.test} | 0
tests/defs.in | 36 ++++-
...include2.test => dist-included-parent-dir.test} | 0
tests/{include.test => hdr-vars-defined-once.test} | 0
tests/{help-regex.test => help-python.test} | 11 +-
tests/lflags.test | 4 +
tests/lflags2.test | 4 +
tests/libtool4.test | 9 +-
tests/ltinit.test | 64 ++++++++
tests/{sinclude.test => m4-inclusion.test} | 8 +-
tests/{check6.test => parallel-tests-subdir.test} | 33 ++---
30 files changed, 624 insertions(+), 121 deletions(-)
copy tests/{autodist-stamp-vti.test => check-exported-srcdir.test} (56%)
create mode 100755 tests/check-tests-in-builddir.test
copy tests/{check11.test => check-tests_environment.test} (70%)
rename tests/{comments-in-var-defn.test => comments-in-var-def.test} (100%)
rename tests/{include2.test => dist-included-parent-dir.test} (100%)
rename tests/{include.test => hdr-vars-defined-once.test} (100%)
copy tests/{help-regex.test => help-python.test} (77%)
create mode 100755 tests/ltinit.test
rename tests/{sinclude.test => m4-inclusion.test} (83%)
copy tests/{check6.test => parallel-tests-subdir.test} (66%)
diff --git a/ChangeLog b/ChangeLog
index 52ffe14..77ecd5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,161 @@
+2011-03-21 Ralf Wildenhues <address@hidden>
+
+ tests: fix unindent to use printf not echo for script.
+ * tests/defs.in: Use printf rather than echo, as the latter may
+ interpret the backslashes in the sed script. Fixes test
+ failures with dash as /bin/sh.
+
+2011-03-17 Stefano Lattarini <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ maintcheck: look for problematic names of testcases
+ The configure.in stub created by default by `tests/defs' obtains
+ the first argument of AC_INIT from the test name, and this can
+ cause some supported autoconf versions to fail with a spurious
+ error if that test name contains the name of an m4 or m4sugar
+ builtin or macro (e.g., `defn' or `m4_undefine').
+ See for example the bug fixed by commit v1.11-287-g1325a8a.
+ This change add a maintainer check that warns about test names
+ which are possibly problematic in this regard.
+ * Makefile.am (sc_test_names): New maintainer-check target.
+ (syntax_check_rules): Add it.
+ (m4_builtins): New helper variable.
+ (TESTS): Updated according to the following renamings.
+ * tests/include.test: Renamed ...
+ * tests/hdr-vars-defined-once.test: ... to this.
+ * tests/sinclude.test: Renamed ...
+ * tests/m4-inclusion.test: ... to this, and simplified
+ accordingly.
+ * tests/include2.test: Renamed ...
+ * tests/dist-included-parent-dir.test: ... to this, for
+ consistency.
+
+2011-03-04 Stefano Lattarini <address@hidden>
+
+ tests: fix bug in alloca*.test
+ * tests/alloca.test: Make grepping of automake stderr stricter,
+ add a trailing `:' command; also, add AC_PROG_CC to configure.in,
+ and create a dummy alloca.c file, to ensure that we fail for the
+ proper reason.
+ * tests/alloca2.test: Likewise. Also, look for LT_INIT, not
+ AC_PROG_LIBTOOL, in the error message (bug introduced with commit
+ v1.11-315-gd51e7b7 "libtool: suggest LT_INIT if LTLIBRARIES
+ primary is used").
+ From a report by Patrick Welche.
+
+2011-03-04 Stefano Lattarini <address@hidden>
+
+ tests: fix bug (comments-in-var-defn.test + autoconf 2.62)
+ * tests/comments-in-var-defn.test: The configure.in stub created
+ by default, which has the AC_INIT first argument obtained by the
+ test name, causes autoconf 2.62 to fail with a spurious error
+ message like: "configure.in:1: error: defn: undefined macro:".
+ Thus, to prevent this, the test is renamed to ...
+ * tests/comments-in-var-def.test: ... this.
+ * tests/Makefile.am (TESTS): Updated.
+
+2011-03-04 Stefano Lattarini <address@hidden>
+
+ cosmetics: convert encoding from ISO-8859 to UTF-8
+ * ChangeLog.03: Convert encoding to UTF-8.
+ * ChangeLog.96: Likewise.
+ * ChangeLog.98: Likewise.
+ * NEWS: Likewise.
+ * TODO: Likewise.
+
+2011-03-01 Peter Rosin <address@hidden>
+
+ test defs: unindent without temporary file
+ * tests/defs.in (commented_sed_unindent_prog): Commented Sed program
+ that strips the "proper" amount of leading whitespace.
+ (unindent): Lazily strip comments from the above program and use it
+ to unindent without using a temporary file.
+
+2011-02-26 Stefano Lattarini <address@hidden>
+
+ libtool: suggest LT_INIT if LTLIBRARIES primary is used
+ When the LTLIBRARIES primary was used, but $(LIBTOOL) wasn't
+ defined, automake suggested to add a call to AC_PROG_LIBTOOL
+ in configure.ac. But that macro is deprecated since Libtool
+ version 1.9b (2004-08-29), in favor of the newer LT_INIT. So
+ suggest the use of this latter macro instead.
+ * lib/Automake/Variable.pm (%_am_macro_for_var): Pair 'LIBTOOL'
+ with 'LT_INIT', not with 'AC_PROG_LIBTOOL'.
+ * libtool4.test: Adjust and extend. Also, add a call to macro
+ AC_PROG_CC in configure.in, to help ensuring that automake does
+ not fail for the wrong reasons.
+ * ltinit.test: New test, ensure that automake's libtool support
+ works with LT_INIT-based interface.
+ Thanks to Jack Kelly for the suggestion.
+
+2011-02-20 Stefano Lattarini <address@hidden>
+
+ tests: tempdirs with restrictive permissions are cleaned correctly
+ Before this change, the removal of a temporary test directory
+ containing subdirectories with restrictive permissions (such as
+ 'r--r--r--') could fail.
+ * tests/defs: Ensure that all the subdirectories of a temporary
+ test directory have the 'read', 'write' and 'execute' bits set,
+ before trying to remove it with `rm -rf'.
+ * tests/Makefile.am (clean-local-check): Likewise.
+
+2011-02-16 Stefano Lattarini <address@hidden>
+ Ralf Wildenhues <address@hidden>
+
+ test defs: add subroutine for input unindenting
+ * tests/defs.in (unindent): New subroutine.
+
+2011-02-15 Stefano Lattarini <address@hidden>
+
+ python: report the 'PYTHON' influential environment variable
+ * m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
+ * doc/automake.texi (Python): Update and extend.
+ * tests/help-python.test: New test.
+ * tests/Makefile.am (TESTS): Update.
+ * THANKS (Jack Kelly): Update e-mail address.
+ Suggestion by Jack Kelly.
+
+2011-02-10 Stefano Lattarini <address@hidden>
+
+ tests defs: clear TESTS_ENVIRONMENT variable
+ * tests/defs.in (TESTS_ENVIRONMENT): Unset it, so that values
+ from environment won't interfere with the testcases.
+ Suggestion by Ralf Wildenhues.
+
+2011-02-06 Stefano Lattarini <address@hidden>
+
+ tests: tweak few tests on simple and parallel test drivers
+ * tests/check-exported-srcdir.test: Improve heading comments.
+ * tests/check-tests-in-builddir.test: Likewise. Also, unset the
+ `FOO_EXIT_STATUS' variable, so that any pre-existing value in the
+ environment won't risk to interfere with the test.
+ Suggestions by Ralf Wildenhues.
+
+2011-02-01 Stefano Lattarini <address@hidden>
+
+ coverage: more tests on simple and parallel test drivers
+ * tests/parallel-tests-subdir.test: New test.
+ * tests/check-exported-srcdir.test: Likewise.
+ * tests/check-tests-in-builddir.test: Likewise.
+ * tests/check-tests_environment.test: Likewise.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-01-29 Stefano Lattarini <address@hidden>
+
+ tests: fix spurious failures in lflags*.test
+ * tests/lflags.test: Remove 'LEX' from the environment, so
+ that it won't be erroneously picked up by `make -e'.
+ * tests/lflags2.test: Likewise.
+
+2011-01-24 Stefano Lattarini <address@hidden>
+
+ docs: color-tests issues with parallel make
+ * doc/automake.texi (Simple Tests): Document that automatic
+ recognition of a capable terminal attached to stdout can fail
+ with some make implementation when running in parallel mode,
+ thus causing colored test output not to be automatically
+ activated when it should.
+
2011-01-23 Ralf Wildenhues <address@hidden>
tests: avoid instspc.test failures due to make's whitespace trimming
diff --git a/ChangeLog.03 b/ChangeLog.03
index eb5b251..0152d56 100644
--- a/ChangeLog.03
+++ b/ChangeLog.03
@@ -67,7 +67,7 @@
* tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
Require texi2dvi-o.
- Report from Václav Haisman.
+ Report from Václav Haisman.
2003-12-10 Alexandre Duret-Lutz <address@hidden>
@@ -1928,9 +1928,9 @@
2003-05-22 Alexandre Duret-Lutz <address@hidden>
- * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
+ * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
- * lib/elisp-comp: s/François/Franc,ois/.
+ * lib/elisp-comp: s/François/Franc,ois/.
Suggested by Paul Eggert.
* automake.in: Move the "main" code at the end.
diff --git a/ChangeLog.96 b/ChangeLog.96
index 33e6542..07f71c2 100644
--- a/ChangeLog.96
+++ b/ChangeLog.96
@@ -234,7 +234,7 @@ Sun Nov 24 00:33:50 1996 Tom Tromey <address@hidden>
* libtool.am (.c.lo): Set --mode=compile when running libtool.
* progs.am: Set --mode=install when running libtool.
- Fix for bug reported by François Pinard:
+ Fix for bug reported by François Pinard:
* automake.in (do_check_merge_target): New sub.
(do_one_merge_target): No longer handle `check'.
(handle_merge_targets): Use do_check_merge_target.
@@ -914,7 +914,7 @@ Tue Sep 3 18:50:32 1996 Tom Tromey <address@hidden>
NORMAL_INSTALL defined.
* m4/AM_PROG_INSTALL.m4: INSTALL_SCRIPT defaults to
- ${INSTALL_PROGRAM}. From François Pinard.
+ ${INSTALL_PROGRAM}. From François Pinard.
Tue Aug 27 08:25:05 1996 Tom Tromey <address@hidden>
@@ -962,7 +962,7 @@ Sat Aug 24 09:30:46 1996 Tom Tromey <address@hidden>
* m4/AM_INIT_AUTOMAKE.m4: Define PACKAGE and VERSION.
- * m4/AM_WITH_REGEX.m4: New version from François Pinard.
+ * m4/AM_WITH_REGEX.m4: New version from François Pinard.
* m4/AM_TYPE_PTRDIFF_T.m4: Use am_cv, not ac_cv.
* m4/AM_C_PROTOTYPES.m4: Ditto.
@@ -1222,7 +1222,7 @@ Sun Aug 4 12:52:43 1996 Tom Tromey <address@hidden>
* automake.in (handle_dist_worker): Use fgrep, not grep.
- * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
+ * m4/AM_C_PROTOTYPES.m4: Changes from François Pinard.
* automake.in (handle_emacs_lisp): Include lisp-clean.am in
output.
@@ -1272,7 +1272,7 @@ Sun Jul 28 11:14:52 1996 Tom Tromey <address@hidden>
Fri Jul 19 10:12:27 1996 Tom Tromey <address@hidden>
* automake.in (initialize_global_constants): Put ansi2knr.c and
- ansi2knr.1 into common_files. Bug report from François Pinard.
+ ansi2knr.1 into common_files. Bug report from François Pinard.
Mon Jul 15 10:28:29 1996 Tom Tromey <address@hidden>
@@ -1730,7 +1730,7 @@ Thu Mar 14 09:28:21 1996 Tom Tromey <address@hidden>
* data.am (address@hidden@DATA): Allow empty list of data.
(address@hidden@DATA): Ditto.
* programs.am (address@hidden@PROGRAMS): Added missing semicolon.
- From François Pinard.
+ From François Pinard.
(address@hidden@PROGRAMS): Fixed bug when list of programs empty.
(address@hidden@PROGRAMS): Ditto.
@@ -2273,7 +2273,7 @@ Fri Jan 19 00:50:29 1996 Tom Tromey <address@hidden>
Thu Jan 18 00:25:56 1996 Tom Tromey <address@hidden>
- From François Pinard:
+ From François Pinard:
* automake.in (handle_source_transform): Transform $o file into .P
file.
(handle_dist_worker): Handle case where DISTFILES includes
@@ -2286,7 +2286,7 @@ Sun Jan 14 13:54:16 1996 Tom Tromey <address@hidden>
* automake.in (scan_configure): Look for NLS support.
- Changes from François Pinard:
+ Changes from François Pinard:
* texinfos.am (install-info): Correctly install when build dir is
not srcdir.
* tags-subd.am (ID): Indentation change.
@@ -2317,7 +2317,7 @@ Sat Jan 13 00:18:06 1996 Tom Tromey <address@hidden>
* texi-version.am (mostlyclean-vti): Remove version.tmp, not
*.tmp.
- * automake.in (handle_dist): Chmod distdir 777. From François
+ * automake.in (handle_dist): Chmod distdir 777. From François
Pinard.
* automake.in (scan_configure): New function.
@@ -2344,7 +2344,7 @@ Thu Jan 11 23:14:18 1996 Tom Tromey <address@hidden>
Tue Jan 9 11:24:14 1996 Tom Tromey <address@hidden>
- Fixes from François Pinard:
+ Fixes from François Pinard:
* depend.am ($(srcdir)/.deps/%.P): Handle deansification.
* automake.in (get_object_extension): Use $o, not $(kr)o.
(handle_source_transform): Don't look for $(kr)c files.
@@ -2394,7 +2394,7 @@ Fri Jan 5 10:31:19 1996 Tom Tromey <address@hidden>
* Added copyright notice to each .am file.
- * automake.in: Cleanups from François Pinard to avoid $#.
+ * automake.in: Cleanups from François Pinard to avoid $#.
(require_argument): Fixed sense of test.
(set_strictness): Bug fix.
@@ -2450,7 +2450,7 @@ Wed Jan 3 00:05:40 1996 Tom Tromey <address@hidden>
ABOUT-GNU.
(check_gnu_standards): Require file COPYING.
- From François Pinard:
+ From François Pinard:
* automake.in (file_contents): Comment out "warn"s.
(usage): Use 4 columns.
(USAGE_FORMAT): Ditto.
@@ -2476,7 +2476,7 @@ Wed Jan 3 00:05:40 1996 Tom Tromey <address@hidden>
Tue Jan 2 23:33:24 1996 Tom Tromey <address@hidden>
* texinfos.am (install-info): Look in $d for info files. From
- François Pinard.
+ François Pinard.
* depend.am ($(srcdir)/.deps/%.P): Fixed regexp.
@@ -2495,7 +2495,7 @@ Mon Jan 1 15:43:25 1996 Tom Tromey <address@hidden>
(read_am_file): Ditto.
(do_one_clean_target): Removed spurious newline.
- Some changes from François Pinard:
+ Some changes from François Pinard:
* Removed trailing whitespace from all '.am' files.
* tags-subd.am (ID): Use &&, not ;.
(TAGS): Ditto.
@@ -2557,7 +2557,7 @@ Sun Dec 31 13:04:59 1995 Tom Tromey <address@hidden>
* automake.in (initialize_global_constants): Don't print body of
loop at make time.
- Changes from François Pinard:
+ Changes from François Pinard:
* depend.am (MKDEP): Include DEFS, INCLUDES, CPPFLAGS, CFLAGS.
(DEP_FILES): Put dependency files in $(srcdir).
Look in $(srcdir) when including dependency files.
diff --git a/ChangeLog.98 b/ChangeLog.98
index bb719c3..1fcc56c 100644
--- a/ChangeLog.98
+++ b/ChangeLog.98
@@ -166,7 +166,7 @@ Fri Dec 11 10:23:17 1998 Matthew D. Langston
<address@hidden>
* Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir.
- Some bugs from François Pinard:
+ Some bugs from François Pinard:
* automake.in (usage): Remove duplicates in file list.
* automake.in (usage): Print files in column-major order.
@@ -1485,7 +1485,7 @@ Sun Jun 22 14:01:59 1997 Tom Tromey <address@hidden>
when actually installing. From Gord Matzigkeit.
* automake.in (handle_tests): Exit status `77' means `ignore
- test'. From François Pinard.
+ test'. From François Pinard.
(handle_tests) Also, make banner same size as text.
* automake.in (handle_configure): Don't handle PRE_BUILT_SOURCES.
@@ -1579,7 +1579,7 @@ Sun May 11 13:59:14 1997 Tom Tromey <address@hidden>
* kr-extra.am (clean-krextra): Remove ansi2knr here, not in
distclean-krextra.
- * missing: Regularized grammar. From François Pinard.
+ * missing: Regularized grammar. From François Pinard.
Sat May 10 16:48:47 1997 Tom Tromey <address@hidden>
@@ -1641,7 +1641,7 @@ Wed Apr 30 14:46:37 1997 Ian Lance Taylor
<address@hidden>
Tue Apr 29 19:11:45 1997 Tom Tromey <address@hidden>
- * INSTALL, mkinstalldirs, install-sh: Update from François
+ * INSTALL, mkinstalldirs, install-sh: Update from François
Pinard.
* aclocal.in (add_macro): If AC_ macro was defined, then mark it
@@ -2001,7 +2001,7 @@ Tue Mar 18 17:20:03 1997 Tom Tromey <address@hidden>
* m4/init.m4 (missing_dir): Use AM_MISSING_PROG.
* m4/missing.m4: New file.
- `missing' changes from François Pinard:
+ `missing' changes from François Pinard:
* Everywhere: Use ACLOCAL_M4 to name aclocal.m4 file; ACLOCAL now
names aclocal program.
* m4/init.m4: Replace programs with `missing' if not found.
@@ -2140,7 +2140,7 @@ Tue Feb 4 18:29:42 1997 Tom Tromey <address@hidden>
(handle_aclocal_m4): Use ACLOCAL_AMFLAGS.
(handle_clean): Put -recursive target before -am target.
(handle_merge_targets): Put basename of $config_name on @all.
- Test confsub.test. From Ramón García Fernández.
+ Test confsub.test. From Ramón GarcÃa Fernández.
Tue Jan 28 22:19:04 1997 Tom Tromey <address@hidden>
diff --git a/Makefile.am b/Makefile.am
index d19d974..316619f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,6 +111,7 @@ dist-hook:
# Some simple checks, and then ordinary check. These are only really
# guaranteed to work on my machine.
syntax_check_rules = \
+sc_test_names \
sc_diff_automake_in_automake \
sc_perl_syntax \
sc_no_brace_variable_expansions \
@@ -151,6 +152,66 @@ sc_at_in_texi
$(syntax_check_rules): automake aclocal
maintainer-check: $(syntax_check_rules)
+## Look for test whose names can cause spurious failures when used as
+## first argument to AC_INIT (chiefly because they might contain an
+## m4/m4sugar builtin or macro name).
+m4_builtins = \
+ __gnu__ \
+ __unix__ \
+ bpatsubst \
+ bregexp \
+ builtin \
+ changecom \
+ changequote \
+ changeword \
+ debugfile \
+ debugmode \
+ decr \
+ define \
+ defn \
+ divert \
+ divnum \
+ dnl \
+ dumpdef \
+ errprint \
+ esyscmd \
+ eval \
+ format \
+ ifdef \
+ ifelse \
+ include \
+ incr \
+ index \
+ indir \
+ len \
+ m4exit \
+ m4wrap \
+ maketemp \
+ mkstemp \
+ patsubst \
+ popdef \
+ pushdef \
+ regexp \
+ shift \
+ sinclude \
+ substr \
+ symbols \
+ syscmd \
+ sysval \
+ traceoff \
+ traceon \
+ translit \
+ undefine \
+ undivert
+sc_test_names:
+ @m4_builtin_rx=`echo $(m4_builtins) | sed 's/ /|/g'`; \
+ m4_macro_rx="\\<($$m4_builtin_rx)\\>|\\<_?(A[CUMHS]|m4)_"; \
+ if ls tests/*.test | LC_ALL=C grep -E "$$m4_macro_rx"; then \
+ echo "the names of the tests above can be problematic" 1>&2; \
+ echo "Avoid test names that contain names of m4 macros" 1>&2; \
+ exit 1; \
+ fi
+
## This check avoids accidental configure substitutions in the source.
## There are exactly 8 lines that should be modified. This works out
## to 28 lines of diffs.
diff --git a/Makefile.in b/Makefile.in
index 29450c3..24ba0d9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -269,6 +269,7 @@ do_subst = sed \
# Some simple checks, and then ordinary check. These are only really
# guaranteed to work on my machine.
syntax_check_rules = \
+sc_test_names \
sc_diff_automake_in_automake \
sc_perl_syntax \
sc_no_brace_variable_expansions \
@@ -305,6 +306,55 @@ sc_unquoted_DESTDIR \
sc_tabs_in_texi \
sc_at_in_texi
+m4_builtins = \
+ __gnu__ \
+ __unix__ \
+ bpatsubst \
+ bregexp \
+ builtin \
+ changecom \
+ changequote \
+ changeword \
+ debugfile \
+ debugmode \
+ decr \
+ define \
+ defn \
+ divert \
+ divnum \
+ dnl \
+ dumpdef \
+ errprint \
+ esyscmd \
+ eval \
+ format \
+ ifdef \
+ ifelse \
+ include \
+ incr \
+ index \
+ indir \
+ len \
+ m4exit \
+ m4wrap \
+ maketemp \
+ mkstemp \
+ patsubst \
+ popdef \
+ pushdef \
+ regexp \
+ shift \
+ sinclude \
+ substr \
+ symbols \
+ syscmd \
+ sysval \
+ traceoff \
+ traceon \
+ translit \
+ undefine \
+ undivert
+
WGET = wget
WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
WGET_SV_GIT_CF = $(WGET)
'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;hb=HEAD;f='
@@ -879,6 +929,14 @@ dist-hook:
.PHONY: $(syntax_check_rules)
$(syntax_check_rules): automake aclocal
maintainer-check: $(syntax_check_rules)
+sc_test_names:
+ @m4_builtin_rx=`echo $(m4_builtins) | sed 's/ /|/g'`; \
+ m4_macro_rx="\\<($$m4_builtin_rx)\\>|\\<_?(A[CUMHS]|m4)_"; \
+ if ls tests/*.test | LC_ALL=C grep -E "$$m4_macro_rx"; then \
+ echo "the names of the tests above can be problematic" 1>&2; \
+ echo "Avoid test names that contain names of m4 macros" 1>&2; \
+ exit 1; \
+ fi
sc_diff_automake_in_automake:
@if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
diff --git a/NEWS b/NEWS
index cd79da1..8a6ac29 100644
--- a/NEWS
+++ b/NEWS
@@ -1455,7 +1455,7 @@ New in 0.32:
New in 0.31:
* Bug fixes
-* Documentation updates (many from François Pinard)
+* Documentation updates (many from François Pinard)
* strictness `normal' now renamed to `foreign'
* Renamed --install-missing to --add-missing
* Now handles AC_CONFIG_AUX_DIR
@@ -1513,7 +1513,7 @@ New in 0.26:
* Comments in Makefile.am are placed more intelligently in Makefile.in
* Generates .PHONY target
* Rule or macro in Makefile.am now overrides contents of Automake file
-* Substantial cleanups from François Pinard
+* Substantial cleanups from François Pinard
New in 0.25:
* Bug fixes.
diff --git a/THANKS b/THANKS
index 78da1de..60af1ee 100644
--- a/THANKS
+++ b/THANKS
@@ -134,7 +134,7 @@ Ian Lance Taylor address@hidden
ÐлÑÑ Ð. ÐолÑбев address@hidden
Imacat address@hidden
Inoue address@hidden
-Jack Kelly address@hidden
+Jack Kelly address@hidden
James Amundson address@hidden
James Henstridge address@hidden
James R. Van Zandt address@hidden
diff --git a/TODO b/TODO
index 0c28f49..79f298f 100644
--- a/TODO
+++ b/TODO
@@ -311,7 +311,7 @@ them in a directory)
Handle dist-zoo. Generally add more DOS support. Maybe run "doschk"
(why isn't this merged with "pathchk"?) when doing a dist. Do
-whatever else François says here...
+whatever else François says here...
Add support for html via an option. Use texi2html. Use
"html_TEXINFOS", and htmldir = .../html. Include html files in
@@ -373,7 +373,7 @@ Auto-distribute "ChangeLog.[0-9]+"? "ChangeLog.[a-z]+"?
Internationalize. [ gettext doesn't have the necessary machinery yet ]
am_error should use printf-style arguments (for eventual gettext scheme)
-François says the ordering of files in a distribution should be as follows:
+François says the ordering of files in a distribution should be as follows:
* README
* source files
* derived files
@@ -433,7 +433,7 @@ follow calc example in dejagnu docs
document which variables are actually scanned and which are not.
-Document customary ordering of Makefile.am. From François.
+Document customary ordering of Makefile.am. From François.
Should include extended version of diagram from Autoconf (suggested by
Greg Woods)
diff --git a/doc/automake.texi b/doc/automake.texi
index bb6891a..4324616 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7603,7 +7603,8 @@ files in your @file{Makefile.am}, depending on where you
want your files
installed (see the definitions of @code{pythondir} and
@code{pkgpythondir} below).
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found},
@ovar{action-if-not-found})
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found}, @
+ @ovar{action-if-not-found})
Search for a Python interpreter on the system. This macro takes three
optional arguments. The first argument, if present, is the minimum
@@ -7629,6 +7630,9 @@ If Python >= 2.5 was only @emph{optional} to the package,
AM_PATH_PYTHON([2.5],, [:])
@end example
+If the @env{PYTHON} variable is set when @code{AM_PATH_PYTHON} is
+called, then that will be the only Python interpreter that is tried.
+
@code{AM_PATH_PYTHON} creates the following output variables based on
the Python installation found during configuration.
@end defmac
@@ -7644,8 +7648,8 @@ to setup a conditional in order to disable the relevant
part of a build
as follows.
@example
- AM_PATH_PYTHON(,, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+AM_PATH_PYTHON(,, [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
@end example
@item PYTHON_VERSION
@@ -8589,6 +8593,12 @@ colored output by setting the @command{make} variable
@samp{AM_COLOR_TESTS=no}, or force colored output even without a connecting
terminal with @samp{AM_COLOR_TESTS=always}.
+Note that the semantics of some @command{make} implementations when used
+in parallel mode (@pxref{Parallel make,,, autoconf, The Autoconf Manual})
+can cause the automatic detection of a connection to a capable terminal
+to fail. In that case, you can still resort to the use of
address@hidden
+
@vindex TESTS
@vindex TESTS_ENVIRONMENT
The variable @code{TESTS_ENVIRONMENT} can be used to set environment
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index cb9d182..686847d 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -162,7 +162,7 @@ my %_am_macro_for_var =
EMACS => 'AM_PATH_LISPDIR',
GCJ => 'AM_PROG_GCJ',
LEX => 'AM_PROG_LEX',
- LIBTOOL => 'AC_PROG_LIBTOOL',
+ LIBTOOL => 'LT_INIT',
lispdir => 'AM_PATH_LISPDIR',
pkgpyexecdir => 'AM_PATH_PYTHON',
pkgpythondir => 'AM_PATH_PYTHON',
diff --git a/m4/python.m4 b/m4/python.m4
index 50e1538..655dcf3 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -40,6 +40,8 @@ AC_DEFUN([AM_PATH_PYTHON],
[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
+ AC_ARG_VAR([PYTHON], [the Python interpreter])
+
m4_if([$1],[],[
dnl No version check is needed.
# Find any Python interpreter.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 78bacf2..4becdbb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -141,6 +141,9 @@ check8.test \
check9.test \
check10.test \
check11.test \
+check-exported-srcdir.test \
+check-tests-in-builddir.test \
+check-tests_environment.test \
checkall.test \
clean.test \
clean2.test \
@@ -166,7 +169,7 @@ comment8.test \
comment9.test \
commen10.test \
commen11.test \
-comments-in-var-defn.test \
+comments-in-var-def.test \
compile.test \
compile2.test \
compile_f90_c_cxx.test \
@@ -285,6 +288,7 @@ dirforbid.test \
dirlist.test \
dirlist2.test \
discover.test \
+dist-included-parent-dir.test \
distcleancheck.test \
distcom2.test \
distcom3.test \
@@ -359,6 +363,7 @@ gnuwarn2.test \
gnits.test \
gnits2.test \
gnits3.test \
+hdr-vars-defined-once.test \
header.test \
help.test \
help2.test \
@@ -371,14 +376,13 @@ help-init.test \
help-lispdir.test \
help-maintainer.test \
help-multilib.test \
+help-python.test \
help-regex.test \
help-silent.test \
help-upc.test \
hfs.test \
hosts.test \
implicit.test \
-include.test \
-include2.test \
info.test \
init.test \
init2.test \
@@ -477,11 +481,13 @@ ltcond.test \
ltcond2.test \
ltconv.test \
ltdeps.test \
+ltinit.test \
ltinstloc.test \
ltlibobjs.test \
ltlibsrc.test \
ltorder.test \
lzma.test \
+m4-inclusion.test \
maintclean.test \
make.test \
makej.test \
@@ -568,6 +574,7 @@ parallel-tests8.test \
parallel-tests9.test \
parallel-tests10.test \
parallel-tests-unreadable-log.test \
+parallel-tests-subdir.test \
parse.test \
percent.test \
percent2.test \
@@ -656,7 +663,6 @@ silent-lex-gcc.test \
silent-lex-generic.test \
silent-yacc-gcc.test \
silent-yacc-generic.test \
-sinclude.test \
srcsub.test \
srcsub2.test \
space.test \
@@ -834,6 +840,6 @@ clean-local-check:
if test "$$#,$$1" = "1,*.dir"; then \
: there is no test directory to clean; \
else \
- find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+ find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
rm -rf "$$@"; \
fi;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4cebd44..559683e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -280,6 +280,9 @@ gcj6.test \
txinfo5.test
parallel_tests = \
+check-exported-srcdir-p.test \
+check-tests-in-builddir-p.test \
+check-tests_environment-p.test \
check-p.test \
check10-p.test \
check11-p.test \
@@ -408,6 +411,9 @@ check8.test \
check9.test \
check10.test \
check11.test \
+check-exported-srcdir.test \
+check-tests-in-builddir.test \
+check-tests_environment.test \
checkall.test \
clean.test \
clean2.test \
@@ -433,7 +439,7 @@ comment8.test \
comment9.test \
commen10.test \
commen11.test \
-comments-in-var-defn.test \
+comments-in-var-def.test \
compile.test \
compile2.test \
compile_f90_c_cxx.test \
@@ -552,6 +558,7 @@ dirforbid.test \
dirlist.test \
dirlist2.test \
discover.test \
+dist-included-parent-dir.test \
distcleancheck.test \
distcom2.test \
distcom3.test \
@@ -626,6 +633,7 @@ gnuwarn2.test \
gnits.test \
gnits2.test \
gnits3.test \
+hdr-vars-defined-once.test \
header.test \
help.test \
help2.test \
@@ -638,14 +646,13 @@ help-init.test \
help-lispdir.test \
help-maintainer.test \
help-multilib.test \
+help-python.test \
help-regex.test \
help-silent.test \
help-upc.test \
hfs.test \
hosts.test \
implicit.test \
-include.test \
-include2.test \
info.test \
init.test \
init2.test \
@@ -744,11 +751,13 @@ ltcond.test \
ltcond2.test \
ltconv.test \
ltdeps.test \
+ltinit.test \
ltinstloc.test \
ltlibobjs.test \
ltlibsrc.test \
ltorder.test \
lzma.test \
+m4-inclusion.test \
maintclean.test \
make.test \
makej.test \
@@ -835,6 +844,7 @@ parallel-tests8.test \
parallel-tests9.test \
parallel-tests10.test \
parallel-tests-unreadable-log.test \
+parallel-tests-subdir.test \
parse.test \
percent.test \
percent2.test \
@@ -923,7 +933,6 @@ silent-lex-gcc.test \
silent-lex-generic.test \
silent-yacc-gcc.test \
silent-yacc-generic.test \
-sinclude.test \
srcsub.test \
srcsub2.test \
space.test \
@@ -1435,7 +1444,7 @@ clean-local-check:
if test "$$#,$$1" = "1,*.dir"; then \
: there is no test directory to clean; \
else \
- find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+ find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
rm -rf "$$@"; \
fi;
diff --git a/tests/alloca.test b/tests/alloca.test
index 6cf51bb..8a1e06e 100755
--- a/tests/alloca.test
+++ b/tests/alloca.test
@@ -20,13 +20,21 @@
set -e
+cat >> configure.in <<'END'
+AC_PROG_CC
+END
+
cat > Makefile.am << 'END'
noinst_LIBRARIES = libtu.a
libtu_a_SOURCES =
libtu_a_LIBADD = @ALLOCA@
END
+: > alloca.c
+
$ACLOCAL
AUTOMAKE_fails
-grep 'Makefile.am:1:.*AC_PROG_RANLIB' stderr
-grep 'Makefile.am:3:.*AC_FUNC_ALLOCA' stderr
+grep '^Makefile\.am:1:.*define .*RANLIB.* add .*AC_PROG_RANLIB' stderr
+grep '^Makefile\.am:3:.*define .*ALLOCA.* add .*AC_FUNC_ALLOCA' stderr
+
+:
diff --git a/tests/alloca2.test b/tests/alloca2.test
index 4ecd229..caf11a3 100755
--- a/tests/alloca2.test
+++ b/tests/alloca2.test
@@ -20,13 +20,21 @@
set -e
+cat >> configure.in <<'END'
+AC_PROG_CC
+END
+
cat > Makefile.am << 'END'
noinst_LTLIBRARIES = libtu.la
libtu_la_SOURCES =
libtu_la_LIBADD = @LTALLOCA@
END
+: > alloca.c
+
$ACLOCAL
AUTOMAKE_fails
-grep 'Makefile.am:1:.*AC_PROG_LIBTOOL' stderr
-grep 'Makefile.am:3:.*ALLOCA' stderr
+grep '^Makefile\.am:1:.*define.*LIBTOOL.* add .*LT_INIT' stderr
+grep '^Makefile\.am:3:.*LTALLOCA' stderr
+
+:
diff --git a/tests/autodist-stamp-vti.test b/tests/check-exported-srcdir.test
similarity index 56%
copy from tests/autodist-stamp-vti.test
copy to tests/check-exported-srcdir.test
index 4f37e14..dc02b22 100755
--- a/tests/autodist-stamp-vti.test
+++ b/tests/check-exported-srcdir.test
@@ -14,47 +14,52 @@
# 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 `stamp-vti' is automatically distributed when info_TEXINFOS
-# and version.texi are involved.
-# Related to automake bug#7819.
+# Check that the testsuite driver (either with or without the
+# parallel-tests option enabled) exports the `srcdir' value in the
+# environment of the tests. This is documented in the manual.
-required=makeinfo
. ./defs || Exit 1
set -e
-cat >> configure.in << END
+show_info ()
+{
+ if test x"$parallel_tests" = x"yes"; then
+ cat foo.log
+ cat test-suite.log
+ else
+ :
+ fi
+}
+
+mkdir SrcDir BuildDir
+
+mv [a-z]* SrcDir
+cd SrcDir
+
+cat >> configure.in << 'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
-info_TEXINFOS = foo.texi
-.PHONY: test
-test: all distdir
- ls -l $(distdir)
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti '
- test -f $(distdir)/stamp-vti
+TESTS = foo.test
END
-cat > foo.texi << 'END'
-\input texinfo
address@hidden foo.info
address@hidden Zardoz
address@hidden Top
address@hidden version.texi
-bar baz quux
address@hidden
+cat > foo.test <<'END'
+#!/bin/sh
+echo "foo.test: srcdir='$srcdir'"
+test x"$srcdir" = x"../SrcDir"
END
-
-# Required when using Texinfo.
-: > texinfo.tex
-cp "$testsrcdir/../lib/mdate-sh" .
+chmod a+x foo.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-./configure
-$MAKE test
+cd ../BuildDir
+../SrcDir/configure
+
+$MAKE check || { show_info; Exit 1; }
+show_info
:
diff --git a/tests/check-tests-in-builddir.test
b/tests/check-tests-in-builddir.test
new file mode 100755
index 0000000..2d0e423
--- /dev/null
+++ b/tests/check-tests-in-builddir.test
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Check that the testsuite driver can find test in the srcdir as
+# well as in builddir, and that is prefers those in the builddir.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TESTS = foo.test bar.test
+EXTRA_DIST = $(TESTS)
+END
+
+cat > foo.test << 'END'
+#! /bin/sh
+exit ${FOO_EXIT_STATUS-0}
+END
+chmod a+x foo.test
+
+unset FOO_EXIT_STATUS || :
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+mkdir build
+cd build
+
+../configure
+
+cat > bar.test << 'END'
+#! /bin/sh
+exit 0
+END
+chmod a+x bar.test
+
+$MAKE check >out 2>&1 || { cat out; Exit1; }
+cat out
+grep '\.\./foo' out && Exit 1
+grep '^PASS: foo.test *$' out
+grep '^PASS: bar.test *$' out
+
+rm -f test-suite.log foo.log bar.log
+
+FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; }
+cat out
+grep '\.\./foo' out && Exit 1
+grep '^FAIL: foo.test *$' out
+grep '^PASS: bar.test *$' out
+
+rm -f test-suite.log foo.log bar.log
+
+# Check that if the same test is present in srcdir and builddir,
+# the one in builddir is preferred.
+cp bar.test foo.test
+FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 || { cat out; Exit1; }
+cat out
+grep '^PASS: foo.test *$' out
+grep '^PASS: bar.test *$' out
+
+# The tests in the builddir must be preferred also by "make dist".
+FOO_EXIT_STATUS=1 $MAKE distcheck
+
+:
diff --git a/tests/check11.test b/tests/check-tests_environment.test
similarity index 70%
copy from tests/check11.test
copy to tests/check-tests_environment.test
index 1fe6a4d..a07ab95 100755
--- a/tests/check11.test
+++ b/tests/check-tests_environment.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,7 +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 skip summary.
+# "Simple Tests" testsuite driver: check TESTS_ENVIRONMENT support.
. ./defs || Exit 1
@@ -25,27 +25,23 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS = skip skip2
+TESTS = foo.test
+EXTRA_DIST = $(TESTS)
END
-cat >>skip <<'END'
+cat > foo.test << 'END'
#! /bin/sh
-exit 77
+test x"$FOO" = x"ok"
END
-chmod a+x skip
-cp skip skip2
+chmod a+x foo.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
-env TESTS=skip $MAKE -e check >stdout
-cat stdout
-grep '1.*passed' stdout && Exit 1
-env TESTS="skip skip2" $MAKE -e check >stdout
-cat stdout
-grep '2.*passed' stdout && Exit 1
+FOO=bad TESTS_ENVIRONMENT='FOO=ok' $MAKE check
+FOO=ok TESTS_ENVIRONMENT='FOO=bad' $MAKE check && Exit 1
:
diff --git a/tests/comments-in-var-defn.test b/tests/comments-in-var-def.test
similarity index 100%
rename from tests/comments-in-var-defn.test
rename to tests/comments-in-var-def.test
diff --git a/tests/defs.in b/tests/defs.in
index 21fcc34..fb57dfd 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -2,7 +2,7 @@
# @configure_input@
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -263,7 +263,7 @@ Exit ()
curdir=`pwd`
testSubDir=$me.dir
test ! -d $testSubDir || {
- find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+ find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
rm -rf $testSubDir
}
mkdir $testSubDir
@@ -275,7 +275,7 @@ if test "$sh_errexit_works" = yes; then
cd "$curdir"
case $exit_status,$keep_testdirs in
0,)
- find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+ find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
rm -rf $testSubDir
;;
esac
@@ -329,6 +329,7 @@ unset oldincludedir pdfdir psdir sbindir sharedstatedir
sysconfdir
# conceptually independent, they cause some changed semantics we
# need to control (and test for) in some of the tests to ensure
# backward-compatible behavior.
+unset TESTS_ENVIRONMENT
unset DISABLE_HARD_ERRORS
unset TESTS
unset TEST_LOG_COMPILER
@@ -439,6 +440,35 @@ AUTOMAKE_fails ()
AUTOMAKE_run 1 ${1+"$@"}
}
+commented_sed_unindent_prog='
+ /^$/b # Nothing to do for empty lines.
+ x # Get x<indent> into pattern space.
+ /^$/{ # No prior x<indent>, go prepare it.
+ g # Copy this 1st non-blank line into pattern space.
+ s/^\(['"$tab"' ]*\).*/x\1/ # Prepare x<indent> in pattern space.
+ } # Now: x<indent> in pattern and <line> in hold.
+ G # Build x<indent>\n<line> in pattern space, and
+ h # duplicate it into hold space.
+ s/\n.*$// # Restore x<indent> in pattern space, and
+ x # exchange with the above duplicate in hold space.
+ s/^x\(.*\)\n\1// # Remove leading <indent> from <line>.
+ s/^x.*\n// # Restore <line> when there is no leading <indent>.
+'
+
+# unindent [input files...]
+# -------------------------
+# Remove the "proper" amount of leading whitespace from the given files,
+# and output the result on stdout. That amount is determined by looking
+# at the leading whitespace of the first non-blank line in the input
+# files. If no input file is specified, standard input is implied.
+unindent ()
+{
+ if test x"$sed_unindent_prog" = x; then
+ sed_unindent_prog=`printf '%s\n' "$commented_sed_unindent_prog" | sed -e
"s/ *# .*//"`
+ fi
+ sed "$sed_unindent_prog" ${1+"$@"}
+}
+
# Turn on shell traces.
set -x
diff --git a/tests/include2.test b/tests/dist-included-parent-dir.test
similarity index 100%
rename from tests/include2.test
rename to tests/dist-included-parent-dir.test
diff --git a/tests/include.test b/tests/hdr-vars-defined-once.test
similarity index 100%
rename from tests/include.test
rename to tests/hdr-vars-defined-once.test
diff --git a/tests/help-regex.test b/tests/help-python.test
similarity index 77%
copy from tests/help-regex.test
copy to tests/help-python.test
index 3eff5f9..ba20013 100755
--- a/tests/help-regex.test
+++ b/tests/help-python.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -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/>.
-# Make sure that obsolescent macro `AM_WITH_REGEX' adds proper text to
-# the configure help screen.
+# Make sure that macro `AM_PATH_PYTHON' adds proper text to the
+# configure help screen.
. ./defs || Exit 1
@@ -23,7 +23,7 @@ set -e
cat > configure.in <<END
AC_INIT([$me], [1.0])
-AM_WITH_REGEX
+AM_PATH_PYTHON
END
$ACLOCAL
@@ -32,7 +32,6 @@ $AUTOCONF
./configure --help >stdout || { cat stdout; Exit 1; }
cat stdout
-$FGREP ' --without-regex ' stdout
-$FGREP ' use GNU rx ' stdout
+grep '^ *PYTHON *the Python interpreter$' stdout
:
diff --git a/tests/lflags.test b/tests/lflags.test
index 97de608..4c3e048 100755
--- a/tests/lflags.test
+++ b/tests/lflags.test
@@ -30,6 +30,10 @@ echo 'extern int dummy;' >> lex.yy.c
END
chmod a+x fake-lex
+# Remove Lex from the environment, so that it won't interfere
+# with `make -e' below.
+unset LEX || :
+
cat >> configure.in <<'END'
AC_PROG_CC
# Simulate presence of Lex using our fake-lex script.
diff --git a/tests/lflags2.test b/tests/lflags2.test
index df766b2..f13c656 100755
--- a/tests/lflags2.test
+++ b/tests/lflags2.test
@@ -31,6 +31,10 @@ echo 'extern int dummy;' >> lex.yy.c
END
chmod a+x fake-lex
+# Remove Lex from the environment, so that it won't interfere
+# with `make -e' below.
+unset LEX || :
+
cat >> configure.in <<'END'
AC_PROG_CXX
# Simulate presence of Lex using our fake-lex script.
diff --git a/tests/libtool4.test b/tests/libtool4.test
index bcc9b0f..9f6a730 100755
--- a/tests/libtool4.test
+++ b/tests/libtool4.test
@@ -20,10 +20,17 @@
set -e
+cat >> configure.in <<'END'
+AC_PROG_CC
+END
+
cat > Makefile.am << 'END'
EXTRA_LTLIBRARIES = liblib.la
END
$ACLOCAL
AUTOMAKE_fails
-grep AC_PROG_LIBTOOL stderr
+grep '[Ll]ibtool library .*LIBTOOL.* undefined' stderr
+grep 'define .*LIBTOOL.* add .*LT_INIT' stderr
+
+:
diff --git a/tests/ltinit.test b/tests/ltinit.test
new file mode 100755
index 0000000..b4eaad6
--- /dev/null
+++ b/tests/ltinit.test
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test that libtool support works correctly when "newer" libtool
+# interface (with LT_INIT etc.) is used (this interface has been
+# present since libtool 1.9b, circa 2004).
+
+required='libtoolize'
+. ./defs || Exit 1
+
+set -e
+
+cat >>configure.in <<'END'
+AC_PROG_CC
+dnl Older libtool versions don't define LT_PREREQ :-(
+m4_ifdef([LT_PREREQ],
+ [LT_PREREQ([2.0])],
+ [m4_fatal([Libtool version too old], [63])])
+LT_INIT([dlopen])
+AC_OUTPUT
+END
+
+cat >Makefile.am <<'END'
+lib_LTLIBRARIES = libfoo.la
+END
+
+cat > libfoo.c <<'END'
+int foo (void)
+{
+ return 1;
+}
+END
+
+libtoolize
+# Skip if older libtool (pre-2.0) is used.
+{ $ACLOCAL && $AUTOCONF; } || {
+ if test $? -eq 63; then Exit 77; else Exit 1; fi
+}
+$EGREP 'LT_(INIT|PREREQ)' configure && Exit 1 # Sanity check.
+$AUTOMAKE -a
+
+cwd=`pwd`
+./configure --prefix="$cwd/inst" >stdout || { cat stdout; Exit 1; }
+cat stdout
+grep '^checking.*dlopen' stdout
+
+$MAKE
+$MAKE install
+$MAKE distcheck
+
+:
diff --git a/tests/sinclude.test b/tests/m4-inclusion.test
similarity index 83%
rename from tests/sinclude.test
rename to tests/m4-inclusion.test
index cc8898b..025d44f 100755
--- a/tests/sinclude.test
+++ b/tests/m4-inclusion.test
@@ -20,13 +20,7 @@
set -e
-# Overwrite configure.in, because the default uses `sinclude' as package
-# name and this play havoc with Autoconf on some platforms (`sinclude'
-# is an m4 macro).
-cat > configure.in <<EOF
-AC_INIT([amsinclude], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
+cat >> configure.in <<'EOF'
sinclude([doesntexist.m4])
EOF
diff --git a/tests/check6.test b/tests/parallel-tests-subdir.test
similarity index 66%
copy from tests/check6.test
copy to tests/parallel-tests-subdir.test
index e32499c..18695fe 100755
--- a/tests/check6.test
+++ b/tests/parallel-tests-subdir.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,41 +14,38 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test for PR 400: XFAIL_TESTS delimited by TABs.
-# Also test that Solaris make VPATH rewriting is honored
+# Check that the parallel-tests driver creates parent directories for
+# the log files when needed.
+parallel_tests=yes
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
-AC_PROG_CC
AC_OUTPUT
END
cat > Makefile.am << 'END'
-TESTS = $(XFAIL_TESTS)
-XFAIL_TESTS = a b c
+TESTS = dir1/foo.test dir2/dir3/foo.test
+TEST_LOG_COMPILER = sh
END
-cat >>a <<'END'
-#! /bin/sh
-exit 1
-END
-
-cp a b
-cp a c
-
-chmod a+x a b c
+mkdir dir1 dir2 dir2/dir3
+echo : > dir1/foo.test
+echo : > dir2/dir3/foo.test
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-./configure
-$MAKE check
-$MAKE distclean
mkdir build
cd build
../configure
$MAKE check
+find . # For debugging.
+test -f test-suite.log
+test -f dir1/foo.log
+test -f dir2/dir3/foo.log
+
+:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-354-g045e22a,
Ralf Wildenhues <=