[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-484-
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-484-g4fa248a |
|
Date: |
Wed, 01 Dec 2010 22:55:25 +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=4fa248abc6380eb4d848707c975d633c7c6801db
The branch, master has been updated
via 4fa248abc6380eb4d848707c975d633c7c6801db (commit)
via bd322a8535f5ff320dc6852765d34a769c2d2140 (commit)
via fdb2764f70ff5f3aed51a61baf3b72511ffb9d11 (commit)
via acb5a214c900cbe1bdfcbb59c063db741856e6eb (commit)
via 22ee3bdfb7d140f61e276eae28fbabe321f6c32a (commit)
via 736bf0144f7b540d391b56990077ae51d193b3c6 (commit)
via 0b2fe01376047225c0c0fe038baf9db37c1701ba (commit)
via 2601fd8f5688a2e9cb4c723c1c42007d3c019fca (commit)
from fe3444ed758409312652fbea0e115b291591c195 (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 4fa248abc6380eb4d848707c975d633c7c6801db
Merge: bd322a8 fdb2764
Author: Stefano Lattarini <address@hidden>
Date: Sat Nov 27 11:07:18 2010 +0100
Merge branch 'maint'
commit bd322a8535f5ff320dc6852765d34a769c2d2140
Author: Stefano Lattarini <address@hidden>
Date: Fri Nov 26 16:04:06 2010 +0100
Remove long-deprecated options --Werror and --Wno-error.
These options has been deprecated at least since commit
"Release-1-6-1b-35-gc037f20", dated 2002-07-06.
* automake.in (parse_arguments): Do not recognize anymore options
`--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
and `-Wno-error'.
* tests/werror.test: Update: use `-Werror' instead of `--Werror'.
* NEWS: Update.
commit acb5a214c900cbe1bdfcbb59c063db741856e6eb
Merge: 736bf01 22ee3bd
Author: Stefano Lattarini <address@hidden>
Date: Thu Nov 25 22:49:56 2010 +0100
Merge branch 'maint'
commit 736bf0144f7b540d391b56990077ae51d193b3c6
Author: Stefano Lattarini <address@hidden>
Date: Thu Nov 25 12:34:59 2010 +0100
Fix some typos in ChangeLog
commit 0b2fe01376047225c0c0fe038baf9db37c1701ba
Merge: fe3444e 2601fd8
Author: Stefano Lattarini <address@hidden>
Date: Thu Nov 25 12:21:00 2010 +0100
Merge branch 'maint'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 100 +++++++++++++-------
NEWS | 3 +-
automake.in | 4 -
tests/Makefile.am | 9 +-
tests/Makefile.in | 9 +-
tests/{silentlex.test => silent-lex-gcc.test} | 13 ++-
tests/{silentlex.test => silent-lex-generic.test} | 9 +-
tests/{silent5.test => silent-many-gcc.test} | 15 ++--
tests/{silent5.test => silent-many-generic.test} | 13 ++-
tests/{silentyacc.test => silent-yacc-gcc.test} | 13 ++-
.../{silentyacc.test => silent-yacc-generic.test} | 9 +-
tests/werror.test | 4 +-
12 files changed, 123 insertions(+), 78 deletions(-)
copy tests/{silentlex.test => silent-lex-gcc.test} (90%)
rename tests/{silentlex.test => silent-lex-generic.test} (92%)
copy tests/{silent5.test => silent-many-gcc.test} (91%)
rename tests/{silent5.test => silent-many-generic.test} (91%)
copy tests/{silentyacc.test => silent-yacc-gcc.test} (90%)
rename tests/{silentyacc.test => silent-yacc-generic.test} (92%)
diff --git a/ChangeLog b/ChangeLog
index 52291de..965a48c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2010-11-26 Stefano Lattarini <address@hidden>
+
+ Remove long-deprecated options --Werror and --Wno-error.
+ These options has been deprecated at least since commit
+ "Release-1-6-1b-35-gc037f20", dated 2002-07-06.
+ * automake.in (parse_arguments): Do not recognize anymore options
+ `--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
+ and `-Wno-error'.
+ * tests/werror.test: Update: use `-Werror' instead of `--Werror'.
+ * NEWS: Update.
+
+2010-11-25 Stefano Lattarini <address@hidden>
+
+ Fix spurious failures in `silent*.test' for $CC != gcc
+ In some tests on automake-produced silent rules, we forced the
+ use of gcc depmode to improve testsuite coverage; but this has
+ unsurprisingly led to spurious failures when some non-GNU C
+ compilers were used. So we are now careful to require GCC in
+ tests that force gcc depmode.
+ From reports by Ralf Wildenhues.
+ * silent5.test: Test removed, its content split into ...
+ * silent-many-generic.test, silent-many-gcc.test: ... these new
+ sister tests, the latter of which forces gcc depmode and lists
+ "gcc" in $required.
+ * silentlex.test: Test removed, its content split into ...
+ * silent-lex-generic.test, silent-lex-gcc.test: ... these new
+ sister tests, the latter of which forces gcc depmode and lists
+ "gcc" in $required.
+ * silentyacc.test: Test removed, its content split into ...
+ * silent-yacc-generic.test, silent-yacc-gcc.test: ... these new
+ sister tests, the latter of which forces gcc depmode and lists
+ "gcc" in $required.
+ * tests/Makefile.am (TESTS): Updated.
+
2010-11-21 Stefano Lattarini <address@hidden>
Tests: consistently use "|| Exit 1" after ". ./defs".
@@ -144,7 +178,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 check 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
@@ -236,7 +270,7 @@
Improve and extend tests on man pages support.
* tests/man.test: Enable `errexit' shell flag, and related changes.
- Make grepping of generated Makefile.in slighty stricter.
+ Make grepping of generated Makefile.in slightly stricter.
* tests/man3.test: Add trailing `:' command.
* tests/man5.test: Prefer cat + here-doc over echo to append to
configure.in.
@@ -264,7 +298,7 @@
useless `$(foo_LDADD)' variable in `Makefile.am'. Do not call
useless macro `AC_F77_LIBRARY_LDFLAGS' in `configure.in'.
* tests/compile_f90_c_cxx.test: Likewise.
- * tests/suffix10.test: Slighty stricter grepping of make output.
+ * tests/suffix10.test: Slightly stricter grepping of make output.
* tests/compile.test: Add trailing `:' command.
* tests/defun2.test: Likewise.
* tests/vars3.test: Likewise.
@@ -286,7 +320,7 @@
2010-11-10 Stefano Lattarini <address@hidden>
Tests defs: move static definitions in a new file `defs-static'.
- The new file is meant to be idempotent w.r.t. mutiple inclusions.
+ The new file is meant to be idempotent w.r.t. multiple inclusions.
* tests/defs.in: Removed, its contents split among ...
* tests/defs-static.in: ... this new file ...
* tests/defs: ... and this new file, including the former.
@@ -307,7 +341,7 @@
the beginning of each tests made sense when Automake used the old
test-driver, which sent all the output directly to stdout/stderr.
Now that the parallel test-driver is used, which saves output of
- each test in its correspoding log file, that old message is just
+ each test in its corresponding log file, that old message is just
useless noise.
Tests defs: rename $curdir -> $testbuilddir
@@ -348,11 +382,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.
@@ -430,7 +464,7 @@
Fix potential bug in generated tests `instpc-*.test'.
This bug is due to the changes introduced by the recently-merged
"tests-init" branch. In that branch, `tests/defs' didn't define
- anymore `$srcdir', instead defininig directly `$testsrcdir'; but
+ anymore `$srcdir', instead defining directly `$testsrcdir'; but
the generated tests were using `$srcdir', hence the bug.
Luckily, since the Automake parallel test driver automatically
exports `srcdir' to a proper value, that prevented the bug from
@@ -524,7 +558,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>
@@ -747,7 +781,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>
@@ -770,7 +804,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).
@@ -803,7 +837,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.
@@ -978,7 +1012,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.
@@ -1021,20 +1055,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.
@@ -1119,7 +1153,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
@@ -1157,7 +1191,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
@@ -1175,7 +1209,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.
@@ -1215,7 +1249,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.
@@ -1526,7 +1560,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.
@@ -1541,7 +1575,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.
@@ -1554,7 +1588,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'.
@@ -1589,7 +1623,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
@@ -1602,7 +1636,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.
@@ -1615,7 +1649,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
@@ -1626,7 +1660,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>
@@ -1693,7 +1727,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.
@@ -1720,7 +1754,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.
@@ -1746,7 +1780,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>
@@ -1892,9 +1926,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.
@@ -2009,7 +2043,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/NEWS b/NEWS
index 649bee9..5e24313 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,8 @@ New in 1.11a:
* Changes to automake:
- automake now generates silenced rules for texinfo outputs.
- - The deprecated option `--output-dir' has been removed.
+ - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
+ have been removed.
* New targets:
diff --git a/automake.in b/automake.in
index 5c44767..27904f0 100644
--- a/automake.in
+++ b/automake.in
@@ -8464,10 +8464,6 @@ sub parse_arguments ()
'c|copy' => \$copy_missing,
'v|verbose' => sub { setup_channel 'verb', silent => 0; },
'W|warnings=s' => \&parse_warnings,
- # These long options (--Werror and --Wno-error) for backward
- # compatibility. Use -Werror and -Wno-error today.
- 'Werror' => sub { parse_warnings 'W', 'error'; },
- 'Wno-error' => sub { parse_warnings 'W', 'no-error'; },
);
use Getopt::Long;
Getopt::Long::config ("bundling", "pass_through");
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9ee1577..b267961 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -714,7 +714,6 @@ silent.test \
silent2.test \
silent3.test \
silent4.test \
-silent5.test \
silent6.test \
silent7.test \
silent8.test \
@@ -722,8 +721,12 @@ silent9.test \
silentcxx.test \
silentf77.test \
silentf90.test \
-silentlex.test \
-silentyacc.test \
+silent-many-gcc.test \
+silent-many-generic.test \
+silent-lex-gcc.test \
+silent-lex-generic.test \
+silent-yacc-gcc.test \
+silent-yacc-generic.test \
sinclude.test \
srcsub.test \
srcsub2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0990f2f..ce9634a 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -976,7 +976,6 @@ silent.test \
silent2.test \
silent3.test \
silent4.test \
-silent5.test \
silent6.test \
silent7.test \
silent8.test \
@@ -984,8 +983,12 @@ silent9.test \
silentcxx.test \
silentf77.test \
silentf90.test \
-silentlex.test \
-silentyacc.test \
+silent-many-gcc.test \
+silent-many-generic.test \
+silent-lex-gcc.test \
+silent-lex-generic.test \
+silent-yacc-gcc.test \
+silent-yacc-generic.test \
sinclude.test \
srcsub.test \
srcsub2.test \
diff --git a/tests/silentlex.test b/tests/silent-lex-gcc.test
similarity index 90%
copy from tests/silentlex.test
copy to tests/silent-lex-gcc.test
index 5ad430e..426dc50 100755
--- a/tests/silentlex.test
+++ b/tests/silent-lex-gcc.test
@@ -14,9 +14,10 @@
# 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 silent-rules mode for Lex.
+# Check silent-rules mode for Lex, forcing gcc depmode.
+# Keep this in sync with sister test `silent-lex-generic.test'.
-required='flex'
+required='flex gcc'
. ./defs || Exit 1
set -e
@@ -63,11 +64,11 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Force gcc ("fast") depmode.
+# This apparently useless "for" loop is here to simplify the syncing
+# with sister test `silent-lex-gcc.test'.
for config_args in \
- '' \
- am_cv_CC_dependencies_compiler_type=gcc \
- --disable-dependency-tracking
+ am_cv_CC_dependencies_compiler_type=gcc
do
./configure $config_args --enable-silent-rules
diff --git a/tests/silentlex.test b/tests/silent-lex-generic.test
similarity index 92%
rename from tests/silentlex.test
rename to tests/silent-lex-generic.test
index 5ad430e..66535e8 100755
--- a/tests/silentlex.test
+++ b/tests/silent-lex-generic.test
@@ -15,6 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check silent-rules mode for Lex.
+# Keep this in sync with sister test `silent-lex-gcc.test'.
required='flex'
. ./defs || Exit 1
@@ -63,11 +64,11 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Force dependency tracking explicitly, so that slow dependency
+# extractors are not rejected. Try also with dependency tracking
+# explicitly disabled.
for config_args in \
- '' \
- am_cv_CC_dependencies_compiler_type=gcc \
- --disable-dependency-tracking
+ --enable-dependency-tracking --disable-dependency-tracking
do
./configure $config_args --enable-silent-rules
diff --git a/tests/silent5.test b/tests/silent-many-gcc.test
similarity index 91%
copy from tests/silent5.test
copy to tests/silent-many-gcc.test
index 49039b8..d770a46 100755
--- a/tests/silent5.test
+++ b/tests/silent-many-gcc.test
@@ -14,13 +14,14 @@
# 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 silent-rules mode, languages other than C.
+# Check silent-rules mode, with gcc depmode and many languages at once.
# This test partly overlaps with other silent*.test, but it serves as
# a stress test by using many different languages at once -- so don't
# remove this test script.
+# This test requires the GNU compilers; keep it in sync with sister test
+# `silent-many-generic.test', which should work with generic compilers.
-# FIXME: generic C++/Fortran compilers should suffice here
-required='g++ gfortran flex bison'
+required='gcc g++ gfortran flex bison'
. ./defs || Exit 1
set -e
@@ -181,11 +182,11 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Force gcc ("fast") depmode.
+# This apparently useless "for" loop is here to simplify the syncing
+# with sister test `silent-many-gcc.test'.
for config_args in \
- '' \
- am_cv_CC_dependencies_compiler_type=gcc \
- --disable-dependency-tracking
+ am_cv_CC_dependencies_compiler_type=gcc
do
./configure $config_args --enable-silent-rules
diff --git a/tests/silent5.test b/tests/silent-many-generic.test
similarity index 91%
rename from tests/silent5.test
rename to tests/silent-many-generic.test
index 49039b8..223a97c 100755
--- a/tests/silent5.test
+++ b/tests/silent-many-generic.test
@@ -14,10 +14,13 @@
# 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 silent-rules mode, languages other than C.
+# Check silent-rules mode, with many languages at once.
# This test partly overlaps with other silent*.test, but it serves as
# a stress test by using many different languages at once -- so don't
# remove this test script.
+# This test should work with generic compilers; keep it in sync with
+# sister test `silent-many-gcc.test', which requires the GNU compilers
+# and forces the use of gcc depmode.
# FIXME: generic C++/Fortran compilers should suffice here
required='g++ gfortran flex bison'
@@ -181,11 +184,11 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Force dependency tracking explicitly, so that slow dependency
+# extractors are not rejected. Try also with dependency tracking
+# explicitly disabled.
for config_args in \
- '' \
- am_cv_CC_dependencies_compiler_type=gcc \
- --disable-dependency-tracking
+ --enable-dependency-tracking --disable-dependency-tracking
do
./configure $config_args --enable-silent-rules
diff --git a/tests/silentyacc.test b/tests/silent-yacc-gcc.test
similarity index 90%
copy from tests/silentyacc.test
copy to tests/silent-yacc-gcc.test
index d311e3d..33ae8ae 100755
--- a/tests/silentyacc.test
+++ b/tests/silent-yacc-gcc.test
@@ -14,9 +14,10 @@
# 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 silent-rules mode for Yacc.
+# Check silent-rules mode for Yacc, forcing gcc depmode.
+# Keep this in sync with sister test `silent-yacc-generic.test'.
-required='bison'
+required='gcc bison'
. ./defs || Exit 1
set -e
@@ -65,11 +66,11 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Force gcc ("fast") depmode.
+# This apparently useless "for" loop is here to simplify the syncing
+# with sister test `silent-yacc-gcc.test'.
for config_args in \
- '' \
- am_cv_CC_dependencies_compiler_type=gcc \
- --disable-dependency-tracking
+ am_cv_CC_dependencies_compiler_type=gcc
do
./configure $config_args --enable-silent-rules
diff --git a/tests/silentyacc.test b/tests/silent-yacc-generic.test
similarity index 92%
rename from tests/silentyacc.test
rename to tests/silent-yacc-generic.test
index d311e3d..b7489da 100755
--- a/tests/silentyacc.test
+++ b/tests/silent-yacc-generic.test
@@ -15,6 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check silent-rules mode for Yacc.
+# Keep this in sync with sister test `silent-yacc-gcc.test'.
required='bison'
. ./defs || Exit 1
@@ -65,11 +66,11 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Force dependency tracking explicitly, so that slow dependency
+# extractors are not rejected. Try also with dependency tracking
+# explicitly disabled.
for config_args in \
- '' \
- am_cv_CC_dependencies_compiler_type=gcc \
- --disable-dependency-tracking
+ --enable-dependency-tracking --disable-dependency-tracking
do
./configure $config_args --enable-silent-rules
diff --git a/tests/werror.test b/tests/werror.test
index 355f9d2..d1b173c 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -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/>.
-# Test to make sure --Werror and --add-missing work together.
+# Test to make sure -Werror and --add-missing work together.
. ./defs || Exit 1
@@ -25,4 +25,4 @@ set -e
rm -f install-sh depcomp missing mkinstalldirs
$ACLOCAL
-$AUTOMAKE --Werror --add-missing
+$AUTOMAKE -Werror --add-missing
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-484-g4fa248a,
Stefano Lattarini <=