[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: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-266-ga9db350 |
|
Date: |
Thu, 25 Nov 2010 11:26:28 +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=a9db350d7bb68336e47df710d46de9b6b204930e
The branch, branch-1.11 has been updated
via a9db350d7bb68336e47df710d46de9b6b204930e (commit)
via 2601fd8f5688a2e9cb4c723c1c42007d3c019fca (commit)
via fadd73d775e558ab476bebd59a39a42e97fbdf39 (commit)
via ddf45657245092f6243124b6629bf0cffea0e4bf (commit)
via 6f1e8ccb0b9289646c84be03f7ea42a7bbb2154d (commit)
via 15cd54c001e1510c6593adfd3391f69d4bcc9c45 (commit)
via b27b2126762e3a39c04548dc21ed30d4cc2c3de7 (commit)
via 3262c47dcfebd2dbfe79f8c885ff81fda6c0a86b (commit)
via 36c1b5c0f0d5e9a9a3c91233fcb0e408ef6093e3 (commit)
via 87b99db562a6353251cd08442ecce8ca262ba807 (commit)
via d0d9f70fffcb66757451b8b53e00ae6cffa92b30 (commit)
via 98462e64b04b0ecd1015961bc3a63caf23f3bb41 (commit)
from 9b767b916a2eda4b368e1fafbf953621327467f0 (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 a9db350d7bb68336e47df710d46de9b6b204930e
Merge: 9b767b9 2601fd8
Author: Stefano Lattarini <address@hidden>
Date: Thu Nov 25 12:20:31 2010 +0100
Merge branch 'maint' into branch-1.11
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 153 +++++++++++++++++++++++++++++++++++++++---------
lib/Automake/Config.in | 2 +-
lib/config-ml.in | 18 +++++-
tests/autohdr.test | 2 +-
tests/autohdr2.test | 2 +-
tests/autohdr3.test | 2 +-
tests/autohdr4.test | 2 +-
tests/cond23.test | 2 +-
tests/cond24.test | 2 +-
tests/cond25.test | 2 +-
tests/cond26.test | 2 +-
tests/cond27.test | 2 +-
tests/cond28.test | 2 +-
tests/cond29.test | 2 +-
tests/cond30.test | 2 +-
tests/cond31.test | 2 +-
tests/cond32.test | 2 +-
tests/cond33.test | 2 +-
tests/cond34.test | 2 +-
tests/cond35.test | 2 +-
tests/cond36.test | 2 +-
tests/cond37.test | 2 +-
tests/cond38.test | 2 +-
tests/cond39.test | 2 +-
tests/cond40.test | 2 +-
tests/cond41.test | 2 +-
tests/cond42.test | 2 +-
tests/cond43.test | 2 +-
tests/cond44.test | 2 +-
tests/cond45.test | 2 +-
tests/dollarvar.test | 2 +-
tests/dollarvar2.test | 2 +-
tests/help2.test | 12 ++++-
tests/help4.test | 4 +-
tests/hfs.test | 2 +-
tests/libobj14.test | 2 +-
tests/percent.test | 2 +-
tests/percent2.test | 2 +-
tests/phony.test | 2 +-
tests/silent.test | 2 +-
tests/silent2.test | 2 +-
tests/silent3.test | 4 +-
tests/silent4.test | 4 +-
tests/silent5.test | 6 ++-
tests/silent6.test | 2 +-
tests/silent7.test | 2 +-
tests/silent9.test | 4 +-
tests/silentcxx.test | 2 +-
tests/silentf77.test | 9 ++-
tests/silentf90.test | 9 ++-
tests/silentlex.test | 2 +-
tests/silentyacc.test | 2 +-
52 files changed, 216 insertions(+), 91 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d19ab37..7f7c8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,100 @@
+2010-11-21 Stefano Lattarini <address@hidden>
+
+ Tests: consistently use "|| Exit 1" after ". ./defs".
+ * tests/autohdr.test: Use `. ./defs || Exit 1', not bare
+ `. ./defs', for consistency with other tests.
+ * tests/autohdr2.test: Likewise.
+ * tests/autohdr3.test: Likewise.
+ * tests/autohdr4.test: Likewise.
+ * tests/cond23.test: Likewise.
+ * tests/cond24.test: Likewise.
+ * tests/cond25.test: Likewise.
+ * tests/cond26.test: Likewise.
+ * tests/cond27.test: Likewise.
+ * tests/cond28.test: Likewise.
+ * tests/cond29.test: Likewise.
+ * tests/cond30.test: Likewise.
+ * tests/cond31.test: Likewise.
+ * tests/cond32.test: Likewise.
+ * tests/cond33.test: Likewise.
+ * tests/cond34.test: Likewise.
+ * tests/cond35.test: Likewise.
+ * tests/cond36.test: Likewise.
+ * tests/cond37.test: Likewise.
+ * tests/cond38.test: Likewise.
+ * tests/cond39.test: Likewise.
+ * tests/cond40.test: Likewise.
+ * tests/cond41.test: Likewise.
+ * tests/cond42.test: Likewise.
+ * tests/cond43.test: Likewise.
+ * tests/cond44.test: Likewise.
+ * tests/cond45.test: Likewise.
+ * tests/dollarvar.test: Likewise.
+ * tests/dollarvar2.test: Likewise.
+ * tests/hfs.test: Likewise.
+ * tests/libobj14.test: Likewise.
+ * tests/percent.test: Likewise.
+ * tests/percent2.test: Likewise.
+ * tests/phony.test: Likewise.
+ * tests/silent.test: Likewise.
+ * tests/silent2.test: Likewise.
+ * tests/silent3.test: Likewise.
+ * tests/silent4.test: Likewise.
+ * tests/silent5.test: Likewise.
+ * tests/silent6.test: Likewise.
+ * tests/silent7.test: Likewise.
+ * tests/silent9.test: Likewise.
+ * tests/silentcxx.test: Likewise.
+ * tests/silentf77.test: Likewise.
+ * tests/silentf90.test: Likewise.
+ * tests/silentlex.test: Likewise.
+ * tests/silentyacc.test: Likewise.
+
+ Avoid useless cleaning in some `silent*.test' tests.
+ * tests/silentf77.test: Removed useless calls to "make clean"
+ and "make maintainer-clean".
+ * tests/silentf90.test: Likewise.
+ * tests/silent3.test: Removed useless call to "make distclean".
+ * tests/silent4.test: Likewise.
+ * tests/silent9.test: Likewise.
+
+2010-11-19 Ian Lance Taylor <address@hidden>
+
+ Sync config-ml.in from GCC.
+ * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
+ compiler/flag environment variables.
+
+2010-11-19 Stefano Lattarini <address@hidden>
+
+ Automake::Config: remove extra trailing semicolon.
+ * lib/Automake/Config.in: Remove extra trailing semicolon.
+
+ help4.test: fix botched heading comment.
+ * tests/help4.test: Fixed the heading comment, since it
+ didn't correctly describe what checks the testcase was
+ supposed to perform.
+
+ help2.test: add checks on aclocal too.
+ * tests/help2.test: Check that also `aclocal --version' and
+ `aclocal --help' work with configure.in and acinclude.m4 both
+ broken.
+
+2010-11-17 Stefano Lattarini <address@hidden>
+
+ Fix spurious failures of silent-rules tests with Sun Fortran.
+ * tests/silentf77.test: Strip from the make output some verbose
+ messages possibly printed by the SunStudio fortran compilers, to
+ avoid spurious failures. Add a trailing `:' command.
+ * tests/silentf90.test: Likewise.
+
+2010-11-17 Stefano Lattarini <address@hidden>
+
+ Fix spurious failures of silent5.test with Sun Fortran.
+ * tests/silent5.test: Strip from the make output some verbose
+ messages possibly printed by the SunStudio fortran compilers,
+ to avoid spurious failures. This bug has been there from the
+ very first version of this test script.
+
2010-11-16 Stefano Lattarini <address@hidden>
Fix regression in colon{5,6}.test (failures on AIX 5.3).
@@ -14,7 +111,7 @@
Fix regression in ansi.test (failure on AIX 5.3).
* tests/ansi.test: Remove redundant hackish check done using a
- hand-postprocessed Makefile.in. This checs worked by setting
+ hand-postprocessed Makefile.in. This checks worked by setting
the `$(SHELL)' macro on the command line of make, but this is
not supported by the AIX 5.3 make implementation.
This bug has been lurking for a long time, and was activated by
@@ -55,11 +152,11 @@
2010-11-07 Stefano Lattarini <address@hidden>
- Fix a bug in variable concatanation with `+='.
+ Fix a bug in variable concatenation with `+='.
* lib/Automake/VarDef.pm (append): Since the content of the
"appended-to" variable is going to be unconditionally normalized
later, simply separate the appended value with a single whitespace
- character, instead of trying to be uselesssly smarter by using
+ character, instead of trying to be uselessly smarter by using
escaped newlines. This fixes a bug in which extra backslashes
where erroneously inserted in the variable's final value.
* tests/pluseq11.test: New test, exposing the bug.
@@ -117,7 +214,7 @@
* tests/help3.test: Likewise, and fix a botched comment.
* tests/help.test: Likewise. Also, use "AUTOMAKE_fails ..."
instead of "$AUTOMAKE ... && Exit 1", for consistency and to
- please maintainet-check.
+ please maintainer-check.
* tests/help2.test: Likewise.
2010-10-03 Stefano Lattarini <address@hidden>
@@ -275,7 +372,7 @@
* tests/help-silent.test: Likewise.
* tests/help-upc.test: Likewise.
* tests/mmode.test: Remove tests on `configure --help' output,
- they are supersed by tests in `help-maintainer.test'.
+ they are superseded by tests in `help-maintainer.test'.
* tests/Makefile.am (TESTS): Update.
2010-09-14 Stefano Lattarini <address@hidden>
@@ -291,7 +388,7 @@
Fix regression in test `colon4.test'.
* tests/colon4.test: Fix botched editing to `configure.in'
that made the test useless. Since we are at it, improve
- comments and make grepping of generated Makefile.in slighty
+ comments and make grepping of generated Makefile.in slightly
stricter.
Regression introduced by change "Modernize, improve and/or
extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
@@ -313,7 +410,7 @@
* tests/confh.test: Run "autoconf", "configure" and "make check",
instead of munging/grepping the generated `Makefile.in'.
* tests/confh4.test: Relax the grepping of Makefile.in w.r.t.
- white spaces. Do not create usless dummy source file `foo.c'
+ white spaces. Do not create useless dummy source file `foo.c'
and useless dummy header file `acconfig.h'.
(configure.in): Remove superfluous call to `AC_OUTPUT'.
* tests/confh6.test: Add trailing `:' command.
@@ -399,7 +496,7 @@
`$me' over hard-coded test name.
* tests/aclocal6.test: Likewise.
* tests/aclocal18.test: Add trailing `:' command, and make
- some grepping slighty stricter.
+ some grepping slightly stricter.
* tests/acloca14.test: Likewise. Also, prefer `diff' over
`cmp', and add some "cosmetic" blank lines.
@@ -442,20 +539,20 @@
README, NEWS), since we run automake in foreign mode anyway.
* tests/pr72.test: Enable `errexit' shell flags, and related
changes. Extend existing checks a bit.
- * tests/pr9.test: Likewise. Also, avoid obolescent constructs in
+ * tests/pr9.test: Likewise. Also, avoid obsolescent constructs in
the generated `configure.in', and extend existing checks over the
generated tarball a bit.
* tests/pr87.test: Enable `errexit' shell flags, and related
changes. Add a trailing `:' command. Also, do not create dummy
files required by "gnu" mode (e.g. README, NEWS), since we run
automake in foreign mode anyway.
- * tests/pr243.test: Avoid obolescent constructs in the generated
+ * tests/pr243.test: Avoid obsolescent constructs in the generated
`configure.in'. Enable the `errexit' shell flag, and related
changes. Cosmetic changes to spacing, add trailing `:' command,
and add a "FIXME" comment.
* tests/pr266.test: Likewise, and add explicit command line switch
`--enable-dependecy-tracking' to the ./configure call.
- * tests/pr279.test: Avoid obolescent constructs in the generated
+ * tests/pr279.test: Avoid obsolescent constructs in the generated
`configure.in'; also, use the `configure.in' stub created by
./defs, rather than writing it from scratch. Enable `errexit'
shell flag, and related changes. Add trailing `:' command.
@@ -540,7 +637,7 @@
* tests/confvar.test: Likewise, and make grepping of Makefile.in
stricter.
* tests/confvar2.test: Likewise.
- * tests/conflnk3.test: Cosmetic changes, and re-enable a temporarly
+ * tests/conflnk3.test: Cosmetic changes. Re-enable a temporarily
disabled test (which didn't work with autoconf <= 2.59, but now we
are requiring autoconf 2.62, so...)
* tests/conflnk4.test: Cosmetic changes, and extend existing tests
@@ -578,7 +675,7 @@
* tests/depcomp.test: Do not create useless dummy source files.
Add a trailing `:' command.
* tests/depcomp2.test: Use `unset' on the CFLAG variable to ensure
- it's not in in the environment, rather tthan exporting it with an
+ it's not in in the environment, rather than exporting it with an
empty value. Do not pass CC=gcc to configure, as that's already
done in ./defs since we have gcc in $required. Ensure verbose
printing of captured stderr, and normalize its checking. Add a
@@ -596,7 +693,7 @@
and dollar characters in grep regexps. Explicitly declare phony
targets as such in the created Makefile.am. Add a trailing `:'
command.
- * tests/depcomp6.test: Consistenty use m4 quoting in the generated
+ * tests/depcomp6.test: Consistently use m4 quoting in the generated
configure.in. Cosmetic fixes to spacing. Make the "dummy" `if'
statement required by OpenBSD's sh `set -e' more robust, and add
explanatory comments to it.
@@ -636,7 +733,7 @@
* tests/subobj9.test: Move setting of `errexit' shell flag earlier
in the script (just after inclusion of ./defs). Fail the test if
`make distcheck' fails. Ensure verbose printing of captured make
- stdout. Avoid uselsss fork by doing simple grep instead of using
+ stdout. Avoid useless fork by doing simple grep instead of using
test -n "`COMMAND | grep ...`".
(configure.in): Normalize the call to AC_INIT w.r.t. other tests.
(Makefile.am): Explicitly mark target "print" as phony.
@@ -910,7 +1007,7 @@
source file.
* tests/suffix7.test: Likewise.
* tests/suffix5.test: Enable `errexit' shell flag, and related
- changes. Make grepping of Makefile.in slighty stricter.
+ changes. Make grepping of Makefile.in slightly stricter.
* tests/suffix.test: Enable `errexit' shell flag, and related
changes. Also, do not redirect grep output to /dev/null, as this
might unmotivatedly hide useful information.
@@ -925,7 +1022,7 @@
$FGREP rather than plain grep.
* tests/suffix11.test: Likewise.
* tests/suffix12.test: Likewise.
- * tests/suffix9.test: Prefet cat + here-doc over echo to append to
+ * tests/suffix9.test: Prefer cat + here-doc over echo to append to
the `configure.in' stub. Cosmetic changes.
* tests/suffix13.test: Cosmetic spacing change.
@@ -938,7 +1035,7 @@
2010-06-13 Stefano Lattarini <address@hidden>
Add useful comment in test script obsolete.test.
- * tests/obsolte.test: Add a comment explaining why we need
+ * tests/obsolete.test: Add a comment explaining why we need
an indirection in adding $AUTOUPDATE to $required.
Normalize whitespaces in 'tests/Makefile.am'.
@@ -964,7 +1061,7 @@
changes, and a couple of unrelated cosmetic changes.
* tests/recurs.test: Use the `configure.in' stub created by
`./defs', rather than writing one from scratch. Make grepping
- of Automake stderr slighty stricter.
+ of Automake stderr slightly stricter.
* tests/substtarg.test: Likewise.
* tests/strip.test: Likewise, and move the call to `set -e'
earlier (just after the inclusion of `./defs'). Also, make sure
@@ -977,7 +1074,7 @@
in ./defs). Avoid potential problems with unpredictable make
output. Finally, make grepping of Makefile.in stricter.
* tests/substre2.test: Ensure verbose printing of the captured
- make's output, and make its grepping slighty stricter.
+ make's output, and make its grepping slightly stricter.
* tests/cygwin32.test: Enable `errexit' shell flag, and related
changes. Also, do not create useless dummy source/data files.
* tests/scripts.test: Likewise.
@@ -990,7 +1087,7 @@
here-doc, not using echo.
* tests/pluseq10.test: Make sure that the captured output of
`make' command is always displayed. Where possible, use $FGREP
- instead of grep (this change makes some checks slighty stricter).
+ instead of grep (this change makes some checks slightly stricter).
* tests/pluseq8.test: Enable `errexit' shell flag, with related
changes.
* tests/pluseq.test: Likewise. Also, do not create useless dummy
@@ -1001,7 +1098,7 @@
* tests/pluseq4.test: Likewise.
* tests/pluseq6.test: Likewise.
* tests/pluseq7.test: Do not create useless dummy source file.
- * tests/pluseq9.test: Slighty extended w.r.t. the grepping of
+ * tests/pluseq9.test: Slightly extended w.r.t. the grepping of
Automake stderr. Some unrelated cosmetic changes.
2010-06-12 Stefano Lattarini <address@hidden>
@@ -1063,7 +1160,7 @@
2010-06-11 Stefano Lattarini <address@hidden>
Improve determination of PATH separator in bootstrap script.
- * bootstrap: Detemine what the PATH separator is the same way
+ * bootstrap: Determine what the PATH separator is the same way
autoconf does.
Minor improvements in bootstrap script.
@@ -1090,7 +1187,7 @@
$AUTOMAKE, and improve the positioning of an $ACLOCAL call.
* tests/exeext4.test: Use $FGREP instead of grep, where possible.
Make auxiliary rules in the generated Makefile more silent.
- These changes make some checks slighty stricter.
+ These changes make some checks slightly stricter.
* tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
* tests/gettext2.test: Place final `:' at the end of the script,
rather than in the middle.
@@ -1116,7 +1213,7 @@
* tests/python2.test: Improved verbose messages.
Make test `ammissing.test' stricter.
- * tests/ammissing.test: Fail if $ACLOCAL succeds unexpectedly.
+ * tests/ammissing.test: Fail if $ACLOCAL succeeds unexpectedly.
Enable `errexit' shell flag.
2010-06-08 Stefano Lattarini <address@hidden>
@@ -1198,9 +1295,9 @@
* tests/nodep.test: Likewise.
* tests/nodepcomp.test: Likewise.
* tests/f90only.test: Likewise, and remove botched/obsoleted
- comments and unecessary commands.
+ comments and unnecessary commands.
* tests/fonly.test: Likewise, and remove botched/obsoleted
- comments and unecessary commands.
+ comments and unnecessary commands.
* tests/discover.test: Likewise, and made stricter.
Enable `errexit' shell flag in all tests cxx*.test.
@@ -1311,7 +1408,7 @@
Extend test on `nostdinc' automake option.
* tests/nostdinc.test: Enable `errexit' shell flag. Related and
unrelated minor changes. Make the grepping of the generated
- Makefile.in slighty stricter. Generate and run configure, so that
+ Makefile.in slightly stricter. Generate and run configure, so that
the generated Makefile can be grepped too.
2010-05-23 Ralf Wildenhues <address@hidden>
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 7e87044..b6674dc 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -34,7 +34,7 @@ our $VERSION = '@VERSION@';
our $libdir = '@datadir@/@address@hidden@APIVERSION@';
our $perl_threads = @PERL_THREADS@;
-1;;
+1;
### Setup "GNU" style for perl-mode and cperl-mode.
## Local Variables:
diff --git a/lib/config-ml.in b/lib/config-ml.in
index f2497ad..2dd0d51 100644
--- a/lib/config-ml.in
+++ b/lib/config-ml.in
@@ -2,7 +2,7 @@
# wanting multilib support.
#
# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -517,6 +517,7 @@ multi-do:
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \
+ GOCFLAGS="$(GOCFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
@@ -750,7 +751,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
break
fi
done
- ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags"
GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
+ ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags"
GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
@@ -758,6 +759,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
F77_=$F77' '
GCJ_=$GCJ' '
GFORTRAN_=$GFORTRAN' '
+ GOC_=$GOC' '
else
# Create a regular expression that matches any string as long
# as ML_POPDIR.
@@ -822,6 +824,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ];
then
esac
done
+ GOC_=
+ for arg in ${GOC}; do
+ case $arg in
+ -[BIL]"${ML_POPDIR}"/*)
+ GOC_="${GOC_}"`echo "X${arg}" | sed -n
"s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n
"s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+ "${ML_POPDIR}"/*)
+ GOC_="${GOC_}"`echo "X${arg}" | sed -n
"s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n
"s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+ *)
+ GOC_="${GOC_}${arg} " ;;
+ esac
+ done
+
if test "x${LD_LIBRARY_PATH+set}" = xset; then
LD_LIBRARY_PATH_=
for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
diff --git a/tests/autohdr.test b/tests/autohdr.test
index 014d2b7..9293bd1 100755
--- a/tests/autohdr.test
+++ b/tests/autohdr.test
@@ -16,7 +16,7 @@
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
index 2ddce32..e2a71cf 100755
--- a/tests/autohdr2.test
+++ b/tests/autohdr2.test
@@ -16,7 +16,7 @@
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
index 8e9f079..f559295 100755
--- a/tests/autohdr3.test
+++ b/tests/autohdr3.test
@@ -17,7 +17,7 @@
# Check rebuild rules for autoheader.
required=GNUmake
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index 187429f..24c57fb 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -18,7 +18,7 @@
# (This should also work without GNU Make.)
required=gcc
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond23.test b/tests/cond23.test
index 4ec596d..e2b133c 100755
--- a/tests/cond23.test
+++ b/tests/cond23.test
@@ -17,7 +17,7 @@
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond24.test b/tests/cond24.test
index 6f76e4d..e548211 100755
--- a/tests/cond24.test
+++ b/tests/cond24.test
@@ -17,7 +17,7 @@
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond25.test b/tests/cond25.test
index 332fda5..02614f9 100755
--- a/tests/cond25.test
+++ b/tests/cond25.test
@@ -17,7 +17,7 @@
# Check that conditional primaries can use non-conditional directories.
# From Pavel Roskin.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond26.test b/tests/cond26.test
index a9baa55..1d93cc0 100755
--- a/tests/cond26.test
+++ b/tests/cond26.test
@@ -17,7 +17,7 @@
# Check that non-conditional primaries can use conditional directories.
# Reported by Juergen Keil.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond27.test b/tests/cond27.test
index 3082902..250b1ef 100755
--- a/tests/cond27.test
+++ b/tests/cond27.test
@@ -17,7 +17,7 @@
# Check that non-conditional primaries cannot use directories defined
# in some conditions (but not others).
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond28.test b/tests/cond28.test
index ccdcf9e..006ef57 100755
--- a/tests/cond28.test
+++ b/tests/cond28.test
@@ -17,7 +17,7 @@
# Check that conditional primaries can use directories defined
# in the same conditions (but not others).
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond29.test b/tests/cond29.test
index 12badcb..8310eab 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -24,7 +24,7 @@
# or cpu time it can found. Although this test won't print `FAIL' if
# it fails, it will take long enough so it can't go unnoticed.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond30.test b/tests/cond30.test
index e092c45..d1935f7 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -16,7 +16,7 @@
# For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond31.test b/tests/cond31.test
index 4975ef4..224d32c 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -16,7 +16,7 @@
# Make sure we define conditional _DEPENDENCIES correctly.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond32.test b/tests/cond32.test
index ae5c8c6..6ec5a20 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -16,7 +16,7 @@
# Make sure the user can override a conditional _DEPENDENCIES.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond33.test b/tests/cond33.test
index 0aff11a..f327cb7 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -17,7 +17,7 @@
# Check for conditional library with a conditional directory.
# Report from Ralf Corsepius
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond34.test b/tests/cond34.test
index 9e42eea..ecb1616 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -17,7 +17,7 @@
# Check for _DEPDENDENCIES definition with conditional _LDADD.
# Report from Elena A. Vengerova
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond35.test b/tests/cond35.test
index 6b3a4d4..0f3b8cf 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -18,7 +18,7 @@
# Report from Roman Fietze.
required='flex bison gcc'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond36.test b/tests/cond36.test
index 58eb529..f6c97db 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -17,7 +17,7 @@
# Check rules output for parser defined conditionally.
required='flex bison gcc'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond37.test b/tests/cond37.test
index 144c2ac..a4ae078 100755
--- a/tests/cond37.test
+++ b/tests/cond37.test
@@ -17,7 +17,7 @@
# Check conditional local rules.
# Report from Simon Josefsson.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond38.test b/tests/cond38.test
index 0051e1f..b1c3036 100755
--- a/tests/cond38.test
+++ b/tests/cond38.test
@@ -17,7 +17,7 @@
# Check conditional variable ordering.
# Report from Ed Hartnett.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond39.test b/tests/cond39.test
index 8d96595..c75c7b5 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -20,7 +20,7 @@
# Build either as CONFIG_FILE or as PROGRAM.
-. ./defs
+. ./defs || Exit 1
set -e
mkdir sub
diff --git a/tests/cond40.test b/tests/cond40.test
index c0bde5c..8552cef 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -20,7 +20,7 @@
# Test AM_COND_IF.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond41.test b/tests/cond41.test
index b32bff3..dd9ffda 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -20,7 +20,7 @@
# AM_COND_IF with an undefined condition should fail.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond42.test b/tests/cond42.test
index 00ca114..428c02b 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -22,7 +22,7 @@
# This shouldn't happen with user input, as _AM_COND_* are not documented,
# but better to be safe.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond43.test b/tests/cond43.test
index 1b468a7..1fa413d 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -20,7 +20,7 @@
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond44.test b/tests/cond44.test
index ac907f1..4b5adc2 100755
--- a/tests/cond44.test
+++ b/tests/cond44.test
@@ -17,7 +17,7 @@
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See cond23.test.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond45.test b/tests/cond45.test
index 57dd339..c70fecb 100755
--- a/tests/cond45.test
+++ b/tests/cond45.test
@@ -17,7 +17,7 @@
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See cond24.test.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
index bdc73ab..7105cb0 100755
--- a/tests/dollarvar.test
+++ b/tests/dollarvar.test
@@ -22,7 +22,7 @@
# containing a `$' on the left hand side of an assignment are not
# portable in practice, even though POSIX allows them. :-/
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
index 0d12afd..6fc2737 100755
--- a/tests/dollarvar2.test
+++ b/tests/dollarvar2.test
@@ -17,7 +17,7 @@
# Test to make sure that -Wportability turns on portability-recursive,
# likewise for -Wno-...
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/help2.test b/tests/help2.test
index 5212092..b74f30a 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure --help and --version work, even when the current directory
-# contains a broken configure.in.
+# contains a broken configure.in and a broken acinclude.m4.
. ./defs || Exit 1
set -e
@@ -29,9 +29,19 @@ ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
echo '[' > configure.in
+echo '[' > acinclude.m4
$AUTOMAKE --version
$AUTOMAKE --help
+$ACLOCAL --version
+$ACLOCAL --help
+
+# Sanity check: aclocal cannot work with broken acinclude.m4.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP acinclude.m4 stderr
+
+rm -f acinclude.m4
# Sanity checks: aclocal and automake cannot work with broken configure.in.
$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
diff --git a/tests/help4.test b/tests/help4.test
index c5eb31e..1b7de41 100755
--- a/tests/help4.test
+++ b/tests/help4.test
@@ -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 --help and --version work, even when no configure.ac
-# is in the current directory.
+# Check that the first among --help and --version to be specified on
+# the command line takes precedence over the following one.
. ./defs || Exit 1
diff --git a/tests/hfs.test b/tests/hfs.test
index 8022729..8f0c5cc 100755
--- a/tests/hfs.test
+++ b/tests/hfs.test
@@ -20,7 +20,7 @@
# Darwin).
# Report from Peter O'Gorman.
-. ./defs
+. ./defs || Exit 1
set -e
echo AC_OUTPUT >>configure.in
diff --git a/tests/libobj14.test b/tests/libobj14.test
index ed20703..0ee750c 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -20,7 +20,7 @@
# Report from Bill Davidson
required=gcc
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/percent.test b/tests/percent.test
index 40f9a43..dfb48ae 100755
--- a/tests/percent.test
+++ b/tests/percent.test
@@ -17,7 +17,7 @@
# Test to make sure that -Wportability understands %-style pattern
# rules.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/percent2.test b/tests/percent2.test
index f7c7f14..09e4f84 100755
--- a/tests/percent2.test
+++ b/tests/percent2.test
@@ -19,7 +19,7 @@
# `${ARCH}/%.$(OBJEXT):'.
# Report from Ralf Corsepius.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/phony.test b/tests/phony.test
index 0f57915..9c9f3d3 100755
--- a/tests/phony.test
+++ b/tests/phony.test
@@ -17,7 +17,7 @@
# Make sure .PHONY can be given dependencies several times.
# From Ralf Corsepius.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent.test b/tests/silent.test
index c91115c..97d881e 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -18,7 +18,7 @@
# Please keep this file in sync with silent2.test.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent2.test b/tests/silent2.test
index da22718..aed8546 100755
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -20,7 +20,7 @@
# Please keep this file in sync with silent.test.
required=gcc
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent3.test b/tests/silent3.test
index d0a0131..17f1959 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent4.test and silent9.test.
required=libtoolize
-. ./defs
+. ./defs || Exit 1
set -e
@@ -85,6 +85,4 @@ grep ' -o libfoo' stdout
# The libtool command line can contain e.g. a `--tag=CC' option.
sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-$MAKE distclean
-
:
diff --git a/tests/silent4.test b/tests/silent4.test
index c6c1298..9c343c0 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -20,7 +20,7 @@
# Please keep this file in sync with silent3.test and silent9.test.
required="libtoolize gcc"
-. ./defs
+. ./defs || Exit 1
set -e
@@ -86,6 +86,4 @@ grep ' -o libfoo' stdout
# The libtool command line can contain e.g. a `--tag=CC' option.
sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-$MAKE distclean
-
:
diff --git a/tests/silent5.test b/tests/silent5.test
index e29f48f..49039b8 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -21,7 +21,7 @@
# FIXME: generic C++/Fortran compilers should suffice here
required='g++ gfortran flex bison'
-. ./defs
+. ./defs || Exit 1
set -e
@@ -35,6 +35,10 @@ do_and_check_silent_build ()
$MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
+ # Avoid spurious failures with SunStudio Fortran compilers.
+ sed '/^NOTICE:/d' stdout > t
+ mv -f t stdout
+ cat stdout
$EGREP ' (-c|-o)' stdout && Exit 1
$EGREP '(mv|ylwrap) ' stdout && Exit 1
diff --git a/tests/silent6.test b/tests/silent6.test
index 2afe6bc..acd9cea 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -16,7 +16,7 @@
# Check user extensibility of silent-rules mode.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent7.test b/tests/silent7.test
index cd8e1b5..5ae8ac0 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -16,7 +16,7 @@
# Check user extensibility of silent-rules mode.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent9.test b/tests/silent9.test
index 11375f8..f0abb29 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent3.test and silent4.test.
required="libtoolize"
-. ./defs
+. ./defs || Exit 1
set -e
@@ -85,6 +85,4 @@ grep ' -o libfoo' stdout
# The libtool command line can contain e.g. a `--tag=CC' option.
sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-$MAKE distclean
-
:
diff --git a/tests/silentcxx.test b/tests/silentcxx.test
index aa64d8f..40fc92e 100755
--- a/tests/silentcxx.test
+++ b/tests/silentcxx.test
@@ -17,7 +17,7 @@
# Check silent-rules mode for C++.
required='g++' # FIXME: any decent C++ compiler should be OK
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentf77.test b/tests/silentf77.test
index 39495d4..cfdb186 100755
--- a/tests/silentf77.test
+++ b/tests/silentf77.test
@@ -18,7 +18,7 @@
# Keep this ins sync with the sister test silentf90.test.
required='gfortran' # FIXME: any working Fortran compiler should be OK!
-. ./defs
+. ./defs || Exit 1
set -e
@@ -63,6 +63,10 @@ $AUTOCONF
./configure --enable-silent-rules
$MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
+# Avoid spurious failures with SunStudio Fortran compilers.
+sed '/^NOTICE:/d' stdout > t
+mv -f t stdout
+cat stdout
$EGREP ' (-c|-o)' stdout && Exit 1
grep 'mv ' stdout && Exit 1
@@ -87,5 +91,4 @@ grep ' -o ' stdout
$EGREP '(F77|FC|LD) ' stdout && Exit 1
-$MAKE clean
-$MAKE maintainer-clean
+:
diff --git a/tests/silentf90.test b/tests/silentf90.test
index 9330bdd..4fe1c3f 100755
--- a/tests/silentf90.test
+++ b/tests/silentf90.test
@@ -18,7 +18,7 @@
# Keep this ins sync with the sister test silentf77.test.
required='gfortran' # FIXME: any working Fortran compiler should be OK!
-. ./defs
+. ./defs || Exit 1
set -e
@@ -63,6 +63,10 @@ $AUTOCONF
./configure --enable-silent-rules
$MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
+# Avoid spurious failures with SunStudio Fortran compilers.
+sed '/^NOTICE:/d' stdout > t
+mv -f t stdout
+cat stdout
$EGREP ' (-c|-o)' stdout && Exit 1
grep 'mv ' stdout && Exit 1
@@ -87,5 +91,4 @@ grep ' -o ' stdout
$EGREP '(F77|FC|LD) ' stdout && Exit 1
-$MAKE clean
-$MAKE maintainer-clean
+:
diff --git a/tests/silentlex.test b/tests/silentlex.test
index 78e0c7d..5ad430e 100755
--- a/tests/silentlex.test
+++ b/tests/silentlex.test
@@ -17,7 +17,7 @@
# Check silent-rules mode for Lex.
required='flex'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentyacc.test b/tests/silentyacc.test
index ac5f061..d311e3d 100755
--- a/tests/silentyacc.test
+++ b/tests/silentyacc.test
@@ -17,7 +17,7 @@
# Check silent-rules mode for Yacc.
required='bison'
-. ./defs
+. ./defs || Exit 1
set -e
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-266-ga9db350,
Stefano Lattarini <=