[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-1828
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1828-gdec3c38 |
|
Date: |
Mon, 06 Feb 2012 22:36:49 +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=dec3c38232bb9006f02c6ca2a04d62e8f5b01125
The branch, master has been updated
via dec3c38232bb9006f02c6ca2a04d62e8f5b01125 (commit)
via 21f979352aa120457b09e4487f5e23a72d8c3dce (commit)
via d7dca5af7aa33024228e7bc21a86383ded4ab2bc (commit)
via ce2c543e2ebaf419906073ce3070ce12784e2d64 (commit)
via a66a0be80e976b66cd87dbd1aebaf15c3e34068b (commit)
via 3522166d467ae99be7440f1e4842b9383c3ec736 (commit)
via 2506b3935b6e890f6d2a5b80234a9a91ab6515e9 (commit)
from d029740b347df2f4792b56d402e9368e8b741c2a (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 dec3c38232bb9006f02c6ca2a04d62e8f5b01125
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 23:02:32 2012 +0100
test defs: avoid spurious XPASS results with NetBSD make
* tests/defs (make_can_chain_suffix_rules): Ensure to properly
declare the '.SUFFIXES:' in the temporary Makefile used to check
whether $MAKE is able to automatically chain suffix rules. This
avoids spurious XPASS results with (at least) NetBSD make in some
'suffix*.tap' tests; in a sense also, this also makes the probing
of $MAKE capabilities more faithful, since the Automake-generated
Makefiles are expected to properly declare the '.SUFFIXES:' as
well.
commit 21f979352aa120457b09e4487f5e23a72d8c3dce
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 22:45:47 2012 +0100
cosmetics: few whitespace fixlets
commit d7dca5af7aa33024228e7bc21a86383ded4ab2bc
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 22:06:18 2012 +0100
cosmetics: various typofixes
Several typofixes in documentation and comments, as
suggested by the "codespell.py" script. Reference:
<http://git.profusion.mobi/cgit.cgi/lucas/codespell/>
commit ce2c543e2ebaf419906073ce3070ce12784e2d64
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 21:54:36 2012 +0100
cosmetics: convert encoding from ISO-8859 to UTF-8 in some tests
The changed files have been converted using iconv; specifically,
the command "iconv --from-code=ISO-8859-1 --to-code=UTF-8".
* tests/block.test, tests/tagsub.test: Converted to UTF-8 encoding.
commit a66a0be80e976b66cd87dbd1aebaf15c3e34068b
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 22:28:20 2012 +0100
test defs: remove obsolete requirement 'rst2html'
* tests/defs (rst2html): Remove, it's not needed anymore now that
the old code supporting the ".log -> .html" conversion for the
parallel-tests harness has been moved in contrib. This removal
should have actually be done in commit v1.11-1757-g0a9d201 of
17-01-2012, 'check: move ".log -> .html" conversion in contrib'.
commit 3522166d467ae99be7440f1e4842b9383c3ec736
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 19:43:34 2012 +0100
tests: workaround for shells with broken 'set -e'
* tests/defs (gmake, native, rst2html): Some versions of the BSD
shell wrongly bail out when the 'errexit' shell flag is active and
the left-hand command in a "&&" list fails, if that list is the
*last* command of a "for" or "while" loop. Work around this issue.
* tests/lex3.test: Likewise.
* tests/check12.test: Likewise.
* tests/yacc-basic.test: Likewise.
* tests/lex-noyywrap.test: Likewise.
* tests/parallel-tests2.test: Likewise.
* tests/lex-lib-external.test: Likewise.
* tests/check-no-test-driver.test: Likewise.
* tests/test-metadata-recheck.test: Likewise.
* tests/parallel-tests-dry-run-1.test: Likewise.
* tests/parallel-tests-dry-run-2.test: Likewise.
* tests/parallel-tests-unreadable.test: Likewise.
* tests/test-driver-custom-no-extra-driver.test: Likewise.
Problem revealed by spurious testsuite failures on a NetBSD 5.1
system and an OpenBSD 5.0 system.
commit 2506b3935b6e890f6d2a5b80234a9a91ab6515e9
Author: Stefano Lattarini <address@hidden>
Date: Mon Feb 6 19:26:12 2012 +0100
cosmetics: fix a typo in comments
* tests/extra-programs-empty.test: Fix typo in heading comments.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.01 | 4 +-
ChangeLog.02 | 4 +-
ChangeLog.04 | 2 +-
ChangeLog.11 | 4 +-
ChangeLog.96 | 16 +++++++-------
ChangeLog.98 | 24 +++++++++++-----------
contrib/README | 3 +-
doc/automake.texi | 4 +-
lib/tap-driver.pl | 2 +-
tests/add-missing.tap | 4 +-
tests/ar-lib5b.test | 4 +-
tests/block.test | 6 ++--
tests/check-no-test-driver.test | 1 +
tests/check12.test | 7 +++--
tests/cond6.test | 2 +-
tests/cygnus-no-dist.test | 4 +-
tests/defs | 24 ++++++++++-----------
tests/extra-programs-empty.test | 4 +-
tests/java-mix.test | 5 ++-
tests/lex-lib-external.test | 3 +-
tests/lex-noyywrap.test | 5 ++-
tests/lex3.test | 5 ++-
tests/parallel-tests-dry-run-1.test | 5 +++-
tests/parallel-tests-dry-run-2.test | 1 +
tests/parallel-tests-extra-programs.test | 2 +-
tests/parallel-tests-unreadable.test | 3 +-
tests/parallel-tests2.test | 5 +++-
tests/python5.test | 2 +-
tests/tagsub.test | 6 ++--
tests/tap-fancy2.test | 2 +-
tests/test-driver-custom-multitest-recheck2.test | 6 ++--
tests/test-driver-custom-no-extra-driver.test | 3 +-
tests/test-metadata-recheck.test | 1 +
tests/txinfo21.test | 6 ++--
tests/yacc-basic.test | 1 +
35 files changed, 97 insertions(+), 83 deletions(-)
diff --git a/ChangeLog.01 b/ChangeLog.01
index d3150b2..2bd9d47 100644
--- a/ChangeLog.01
+++ b/ChangeLog.01
@@ -1436,7 +1436,7 @@
* m4/auxdir.m4: More comments.
2001-07-31 Richard Boulton <address@hidden>
- Raja R Harinath <address@hidden>
+ Raja R Harinath <address@hidden>
* automake.in (variable_conditions_sub): Remove @parent_conds
argument. This was old logic - duplicate or impossible
@@ -1634,7 +1634,7 @@
* lib/am/tags.am (GTAGS): Added GTAGS_ARGS. From Shigio Yamaguchi.
2001-07-19 Tom Tromey <address@hidden>
- Alexandre Duret-Lutz <address@hidden>
+ Alexandre Duret-Lutz <address@hidden>
Fix for ccnoco.test, subobj8.test:
* m4/Makefile.am (m4data_DATA): Added auxdir.m4.
diff --git a/ChangeLog.02 b/ChangeLog.02
index 7e5caa7..45a7c67 100644
--- a/ChangeLog.02
+++ b/ChangeLog.02
@@ -2238,7 +2238,7 @@
Reported by Braden N. McDaniel.
2002-05-08 Charles Wilson <address@hidden>
- Alexandre Duret-Lutz <address@hidden>
+ Alexandre Duret-Lutz <address@hidden>
* lib/am/progs.am (clean-%DIR%PROGRAMS): If Libtool is used, clean
both `program$(EXEEXT)' and `program'; needed under Cygwin.
@@ -3146,7 +3146,7 @@
2002-01-06 Raja R Harinath <address@hidden>
* automake.in (handle_languages): Emit an automake
- internal variable 'am__depfiles_maybe'.
+ internal variable 'am__depfiles_maybe'.
* lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe.
* lib/am/configure.am (%MAKEFILE%): Pass `depfiles' to
diff --git a/ChangeLog.04 b/ChangeLog.04
index 5dfcd9e..ee393ca 100644
--- a/ChangeLog.04
+++ b/ChangeLog.04
@@ -1549,7 +1549,7 @@
(generate_makefile): Likewise.
* tests/nodist3.test: Ensure that DIST_SOURCES is not created,
and that dist target does not exist.
- Reported by Tom Fitzsimmons.
+ Reported by Tom Fitzsimmons.
2004-01-02 Alexandre Duret-Lutz <address@hidden>
diff --git a/ChangeLog.11 b/ChangeLog.11
index 50b37ec..9c2af31 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -415,7 +415,7 @@
(posixsubst-ltlibraries.log): Likewise.
* tests/defs: Adjust the path of the included `get.sh' scripts
generated by `libtool-macros.test' and `gettext-macros.test'.
- * aclocal.m4: Delete, it's auto-generated now.
+ * aclocal.m4: Delete, it's auto-generated now.
* configure: Likewise.
* Makefile.in: Likewise.
* doc/Makefile.in: Likewise.
@@ -7109,7 +7109,7 @@
* tests/yflags.test: Likewise.
* tests/yflags-force-conditional.test: Likewise.
* tests/lflags2.test: Simplify so that it doesn't require a
- C++ compiler anymore.
+ C++ compiler anymore.
* tests/yflags2.test: Likewise.
* tests/autohdrdry.test (configure.in): Remove unneeded call
to `AC_PROG_CC'.
diff --git a/ChangeLog.96 b/ChangeLog.96
index 07f71c2..c721146 100644
--- a/ChangeLog.96
+++ b/ChangeLog.96
@@ -172,7 +172,7 @@ Tue Dec 3 11:29:01 1996 Gordon Matzigkeit
<address@hidden>
* compile-kr.am: Quote arguments to echo.
* progs.am: Fix up problems when LIBTOOL is not defined (by
- setting shell variable instprog to the installation program).
+ setting shell variable instprog to the installation program).
* aclocal.in (scan_file): Allow the acinclude.m4 file to override
any other macro files (but still prevent multiple definitions
@@ -194,7 +194,7 @@ Tue Dec 3 10:40:48 1996 Tom Tromey <address@hidden>
Mon Dec 2 13:51:11 1996 Gordon Matzigkeit <address@hidden>
* automake.in (get_object_extension): Unshift ansi2knr onto the
- all target, so that it builds before any other targets.
+ all target, so that it builds before any other targets.
[de_ansi_objects]: Delete, since unshifting ansi2knr is an easier
solution.
@@ -306,7 +306,7 @@ Fri Nov 15 18:58:04 1996 Tom Tromey <address@hidden>
* tags.am (tags-recursive): Removed.
(TAGS): Depend on @DIRS@, @address@hidden Use @CONFIG@ in rule.
(ID): From tags-subd.am.
-
+
* aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH.
* automake.in (scan_configure): Recognize AC_FUNC_FNMATCH.
* m4/fnmatch.m4: Removed (now in autoconf).
@@ -1311,7 +1311,7 @@ Tue Jun 18 10:53:54 1996 Tom Tromey <address@hidden>
* automake.in (handle_tests): Don't directly generate site.exp.
Sun Jun 16 22:21:16 1996 Harlan Stenn <address@hidden>
-
+
* automake.in: Treat an initial `#' on a word in AUTOMAKE_OPTIONS
as a comment start. Add support for a dist-tarZ target.
@@ -1572,8 +1572,8 @@ Thu Apr 25 18:40:06 1996 Tom Tromey <address@hidden>
Tue Apr 23 17:57:13 1996 Andreas Schwab <address@hidden>
* doc/mdate-sh: Extract the last field from the date output, not
- the sixth, which will fail when the timezone name has more than
- one word or is missing.
+ the sixth, which will fail when the timezone name has more than
+ one word or is missing.
Wed Apr 24 20:29:26 1996 Tom Tromey <address@hidden>
@@ -2125,9 +2125,9 @@ Wed Feb 7 18:00:29 1996 Tom Tromey <address@hidden>
Give error if appropriate install macro not seen.
(handle_subdirs): Ensure $seen_gettext before requiring
gettext-specific files.
- (handle_configure): Automatically rebuild
+ (handle_configure): Automatically rebuild
- From Jim Meyering:
+ From Jim Meyering:
* automake.in (handle_source_transform): Use \W when quoting
regexp. When blah_SOURCES not explicitly defined, still create
entry in %deps.
diff --git a/ChangeLog.98 b/ChangeLog.98
index 1fcc56c..717b7f5 100644
--- a/ChangeLog.98
+++ b/ChangeLog.98
@@ -122,7 +122,7 @@ Fri Dec 11 10:23:17 1998 Matthew D. Langston
<address@hidden>
1998-12-20 Thomas Tanner <address@hidden>
* automake.in (handle_libraries, handle_ltlibraries): relax the
- name checking to not enforce `^lib.*' for the sake of building libtool
+ name checking to not enforce `^lib.*' for the sake of building libtool
modules.
1998-12-21 Tom Tromey <address@hidden>
@@ -301,7 +301,7 @@ Thu Oct 8 15:00:57 1998 Matthew D. Langston
<address@hidden>
* automake.in: Registered the ppf77 language (`.F' extension) for
preprocessed Fortran 77.
-
+
* automake.in: Registered the ratfor language (`.r' extension).
* automake.in: Registered Fortran 77 header files with the "header
@@ -525,7 +525,7 @@ Tue Sep 29 00:10:22 1998 Tom Tromey <address@hidden>
* automake.in: New pattern: INCLUDE_PATTERN.
(read_am_file): Make AM_FILE a local filehandle.
- For INCLUDE_PATTERN, store included paths on @include_stack and call
+ For INCLUDE_PATTERN, store included paths on @include_stack and call
read_am_file with argument.
(handle_configure): When printing the dependencies for
Makefile.in, print the items on include_stack (if any) as
@@ -533,7 +533,7 @@ Tue Sep 29 00:10:22 1998 Tom Tromey <address@hidden>
* automake.texi: Make a command index `cm' that goes into the
concept index. Put if, endif, else, and include in the command index.
- (Include): Show usage of include directive.
+ (Include): Show usage of include directive.
Mon Sep 28 00:03:45 1998 Tom Tromey <address@hidden>
@@ -663,8 +663,8 @@ Mon Sep 14 00:55:12 1998 Per Cederqvist <address@hidden>
Fix for Dynix 3.1.1.
* automake.in (handle_yacc_lex_cxx): Transform "# " to "#line";
- some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the
- output from the preprocessor.
+ some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the
+ output from the preprocessor.
Tue Aug 25 18:40:51 1998 Tom Tromey <address@hidden>
@@ -744,7 +744,7 @@ Fri Jul 17 07:37:20 1998 H.J. Lu (address@hidden)
Fri Jul 17 11:58:27 1998 Ian Lance Taylor <address@hidden>
* automake.in: Use $(AM_MAKEFLAGS) in every invocation of $(MAKE).
- * subdirs.am: Likewise.
+ * subdirs.am: Likewise.
Thu Jul 16 18:09:03 1998 Ian Lance Taylor <address@hidden>
@@ -825,7 +825,7 @@ Sun Apr 5 13:58:24 1998 Tom Tromey <address@hidden>
* Released 1.3.
* automake.in (handle_options): Correctly handle trailing alpha
- version letter or lack thereof. Test version3.test.
+ version letter or lack thereof. Test version3.test.
* automake.in (am_conf_line_warning): Perl 4 fixlet; typo fix.
@@ -846,7 +846,7 @@ Fri Apr 3 15:43:46 1998 Doug Evans <address@hidden>
* automake.in (handle_configure): Fix setting of colon_infile
in case where multiple files are used to build Makefile.
[ Test colon5.test ]
-
+
Fri Apr 3 13:07:58 1998 Tom Tromey <address@hidden>
* ansi2knr.c, texinfo.tex: New versions from respective
@@ -1424,7 +1424,7 @@ Tue Aug 5 14:44:10 1997 Ian Lance Taylor
<address@hidden>
Mon Aug 4 14:52:08 1997 Ian Lance Taylor <address@hidden>
* automake.in ($RULE_PATTERN): Accept $ in body of rule name.
- (handle_programs): Don't append $(EXEEXT) if the
+ (handle_programs): Don't append $(EXEEXT) if the
program name contains '.'.
(am_install_var): When rewriting _PROGRAMS, don't append $(EXEEXT)
if the program names contains '.'. Also, handle conditionals.
@@ -1529,7 +1529,7 @@ Sat Feb 22 16:05:24 1997 Gordon Matzigkeit
<address@hidden>
need compile-kr.am. Delete it.
* automake.in (handle_yacc_lex_cxx, get_object_extension): Use
- _.c, _.o, _.lo instead of ._c, ._o, .l_o for de-ansification.
+ _.c, _.o, _.lo instead of ._c, ._o, .l_o for de-ansification.
* ansi2knr.c (main): Parse our arguments a little differently so
that we don't create null output files when we can't read the
@@ -2058,7 +2058,7 @@ Wed Feb 26 08:41:11 1997 Gordon Matzigkeit
<address@hidden>
to do to upgrade the support.
* automake.in, ltlib-clean.am, ltlib.am, ltlibrary.am: Revamped
- libtool support to use the _LTLIBRARIES primary.
+ libtool support to use the _LTLIBRARIES primary.
Wed Feb 26 00:20:39 1997 Tom Tromey <address@hidden>
diff --git a/contrib/README b/contrib/README
index bbef72f..a4d7eeb 100644
--- a/contrib/README
+++ b/contrib/README
@@ -14,7 +14,7 @@ There are several reasons for which a feature can be kept in
contrib:
core (as doing so too early would later force us to continue the
support for backward-compatibility, even if the features proves
flawed or fails to attract widespread use).
-
+
2. The APIs or overall design of the feature are still unstable, and
need on-field testing to iron warts and usability bugs, or uncover
potential flaws.
@@ -24,4 +24,3 @@ There are several reasons for which a feature can be kept in
contrib:
remove it from the Automake core, but cannot remove it altogether,
for the sake of those still-existing usage. So it gets moved in
contrib.
-
diff --git a/doc/automake.texi b/doc/automake.texi
index 8ff081e..a0ac380 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -8979,7 +8979,7 @@ The parallel (or concurrent) test harness is enabled by
the Automake option
scripts output in @file{.log} files, concurrent execution of tests with
@code{make -j}, specification of inter-test dependencies, lazy reruns of
tests that have not completed in a prior run, and hard errors for exceptional
-failures.
+failures.
This harness is still somewhat experimental and may undergo changes in
order to satisfy additional portability requirements.
@@ -12374,7 +12374,7 @@ user counterpart.
has neither @code{AM_} nor per-target cousin.
Finally you should not think that the existence of a per-target
-variable implies the existance of an @code{AM_} variable or of a user
+variable implies the existence of an @code{AM_} variable or of a user
variable. For instance, the @code{mumble_LDADD} per-target variable
overrides the makefile-wide @code{LDADD} variable (which is not a user
variable), and @code{mumble_LIBADD} exists only as a per-target
diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl
index 9ce1a31..ecc2c0c 100755
--- a/lib/tap-driver.pl
+++ b/lib/tap-driver.pl
@@ -394,7 +394,7 @@ sub handle_tap_result ($)
my $test_result = stringify_result_obj $result_obj;
my $string = $result_obj->number;
-
+
my $description = $result_obj->description;
$string .= " $description"
unless is_null_string $description;
diff --git a/tests/add-missing.tap b/tests/add-missing.tap
index 4f5d682..49dc8bb 100755
--- a/tests/add-missing.tap
+++ b/tests/add-missing.tap
@@ -166,7 +166,7 @@ check_ ()
# not told to install them, it should complain and error out,
# and also give a useful suggestion.
AUTOMAKE_fails -d "$pfx missing files, automake fails"
- for f in $files; do
+ for f in $files; do
command_ok_ \
"$pfx warn about missing file $f" \
grep "required file ['\`]$build_aux/$f' not found" stderr
@@ -189,7 +189,7 @@ check_ ()
test -f $build_aux/$f
done
# Automake should inform about which files it's installing.
- for f in $files; do
+ for f in $files; do
command_ok_ \
"$pfx report installation of $f" \
grep ": installing ['\`]$build_aux/$f'$" stderr
diff --git a/tests/ar-lib5b.test b/tests/ar-lib5b.test
index 09742ca..f697e3c 100755
--- a/tests/ar-lib5b.test
+++ b/tests/ar-lib5b.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@ case " $* " in
# configure tests.
*' -OUT:'*) exit 0;;
# This means that $* looks like a command-line for `ar'. We have to
- # exit with failure here, to accomodate the two following ortoghonal
+ # exit with failure here, to accommodate the two following ortoghonal
# scenarios:
# 1. when `lib' is tested by configure, this will tell that it does
# not use the ar(1) interface, so that the `ar-lib' script will
diff --git a/tests/block.test b/tests/block.test
index 0eda190..f645c09 100755
--- a/tests/block.test
+++ b/tests/block.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996, 2001, 2002, 2010, 2011, 2012 Free Software
+# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Make sure block comments are not double-spaced.
-# Report from François Pinard.
+# Report from François Pinard.
. ./defs || Exit 1
diff --git a/tests/check-no-test-driver.test b/tests/check-no-test-driver.test
index 9406917..19ba34c 100755
--- a/tests/check-no-test-driver.test
+++ b/tests/check-no-test-driver.test
@@ -29,6 +29,7 @@ for opts in '' '-a' '--add-missing --copy'; do
$AUTOMAKE $opts
$FGREP 'test-driver' Makefile.in && Exit 1
find . | $FGREP 'test-driver' && Exit 1
+ : For shells with busted 'set -e'.
done
:
diff --git a/tests/check12.test b/tests/check12.test
index be4d84e..88235f8 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -100,7 +100,7 @@ END
cat >> Makefile.am <<'END'
check-local:
case $$CHECKLOCAL_EXIT_STATUS in \
- 0) echo 'check-local succeded :-)';; \
+ 0) echo 'check-local succeeded :-)';; \
*) echo 'check-local failed :-(';; \
esac >local.log
exit $$CHECKLOCAL_EXIT_STATUS
@@ -143,7 +143,7 @@ for vpath in : false; do
else
:
fi
- grep 'check-local succeded :-)' local.log
+ grep 'check-local succeeded :-)' local.log
cp -f config.status config-status.sav
@@ -202,6 +202,7 @@ for vpath in : false; do
grep '^FAIL: b$' test-suite.log
grep '^b\.test: exit status: 23$' test-suite.log
grep '^a\.test' test-suite.log && Exit 1
+ : For shells with busted 'set -e'.
else :; fi
grep 'check-local failed :-(' local.log
diff --git a/tests/cond6.test b/tests/cond6.test
index 60436ab..0ac1783 100755
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -64,7 +64,7 @@ cat stdout
grep '^BEG: a b c d e f g h :END$' stdout
$MAKE install
-for x in a b c d e f g h; do
+for x in a b c d e f g h; do
test -f _inst/Help/$x
done
diff --git a/tests/cygnus-no-dist.test b/tests/cygnus-no-dist.test
index acb5ec6..47beef6 100755
--- a/tests/cygnus-no-dist.test
+++ b/tests/cygnus-no-dist.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ mkdir sub1 sub2
: > sub1/Makefile.am
cat > sub2/Makefile.am <<'END'
# The `-Wall' after `cygnus' should ensure no warning gets
-# unintentionally disabled. We are particularily interested
+# unintentionally disabled. We are particularly interested
# in override warnings, for when (below) we add the `distdir'
# target.
AUTOMAKE_OPTIONS = cygnus -Wall
diff --git a/tests/defs b/tests/defs
index 40842cd..6d3810b 100644
--- a/tests/defs
+++ b/tests/defs
@@ -422,6 +422,7 @@ make_can_chain_suffix_rules ()
mkdir am__chain.dir$$
cd am__chain.dir$$
unindent > Makefile << 'END'
+ .SUFFIXES: .u .v .w
.u.v: ; cp $< $@
.v.w: ; cp $< $@
END
@@ -742,7 +743,10 @@ do
MAKE=$make_ am__using_gmake=''
test "$MAKE" = : && break
echo "$me: determine whether $MAKE is GNU make"
- using_gmake && break
+ # Don't use "&&" here, or a bug of 'set -e' present in some
+ # versions of the BSD shell will be triggered. We add the
+ # dummy "else" branch for extra safety.
+ if using_gmake; then break; else :; fi
done
test "$MAKE" = : && skip_all_ "this test requires GNU make"
export MAKE
@@ -870,7 +874,12 @@ do
fi
;;
native)
- cross_compiling && skip_all_ "doesn't work in cross-compile mode"
+ # Don't use "&&" here, to avoid a bug of 'set -e' present in
+ # some (even relatively recent) versions of the BSD shell.
+ # We add the dummy "else" branch for extra safety.
+ if cross_compiling; then
+ skip_all_ "doesn't work in cross-compile mode"
+ else :; fi
;;
python)
# Python doesn't support --version, it has -V
@@ -893,17 +902,6 @@ do
fi
unset ro_dir_temp create_status
;;
- rst2html)
- # Try the variants that are tried in check.am.
- while :; do
- for r2h in $RST2HTML rst2html rst2html.py; do
- echo "$me: running $r2h --version"
- $r2h --version && break 2
- done
- skip_all_ "no proper rst2html program found"
- done
- unset r2h
- ;;
runtest)
# DejaGnu's runtest program. We rely on being able to specify
# the program on the runtest command-line. This requires
diff --git a/tests/extra-programs-empty.test b/tests/extra-programs-empty.test
index 992c5ee..e46e1ac 100755
--- a/tests/extra-programs-empty.test
+++ b/tests/extra-programs-empty.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test that EXTRA_PROGRAMS doesn't get removed because it is empty.
-# This check hs been introduced in commit `Release-1-9-254-g9d0eaef'
+# This check has been introduced in commit `Release-1-9-254-g9d0eaef'
# into the former test `subst2.test'.
. ./defs || Exit 1
diff --git a/tests/java-mix.test b/tests/java-mix.test
index 2bf4f72..44d8d83 100755
--- a/tests/java-mix.test
+++ b/tests/java-mix.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
# Check that the JAVA primary can be used freely in the same Makefile.am
# with proper combinations of the `dist_', `nodist_' and `nobase_'
-# modifiers. Also check that `.java' files are not ditributed by default.
+# modifiers. Also check that `.java' files are not distributed by
+# default.
. ./defs || Exit 1
diff --git a/tests/lex-lib-external.test b/tests/lex-lib-external.test
index 5f04594..1fb0009 100755
--- a/tests/lex-lib-external.test
+++ b/tests/lex-lib-external.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -69,6 +69,7 @@ $MAKE all
if cross_compiling; then :; else
echo GOOD | ./lexer
echo BAD | ./lexer && Exit 1
+ : For shells with busted 'set -e'.
fi
$MAKE distcheck
diff --git a/tests/lex-noyywrap.test b/tests/lex-noyywrap.test
index 9431970..98561f2 100755
--- a/tests/lex-noyywrap.test
+++ b/tests/lex-noyywrap.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011, 2012 Free
+# Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -64,6 +64,7 @@ $MAKE
if cross_compiling; then :; else
echo GOOD | ./foo
echo BAD | ./foo && Exit 1
+ : For shells with busted 'set -e'.
fi
# Sanity check on distribution.
diff --git a/tests/lex3.test b/tests/lex3.test
index 46f0b9f..01d9651 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2010, 2011, 2012 Free
+# Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -67,6 +67,7 @@ $MAKE
if cross_compiling; then :; else
echo GOOD | ./foo
echo BAD | ./foo && Exit 1
+ : For shells with busted 'set -e'.
fi
# The generated file `foo.c' must be shipped.
diff --git a/tests/parallel-tests-dry-run-1.test
b/tests/parallel-tests-dry-run-1.test
index 4ed59f0..27e62a0 100755
--- a/tests/parallel-tests-dry-run-1.test
+++ b/tests/parallel-tests-dry-run-1.test
@@ -51,7 +51,10 @@ none_exist ()
{
st=0
for i in $*; do
- { test -r $i || test -f $i; } && { echo File $i found; st=1; }
+ if test -r $i || test -f $i; then
+ echo File $i found
+ st=1
+ fi
done
test $st -eq 0
}
diff --git a/tests/parallel-tests-dry-run-2.test
b/tests/parallel-tests-dry-run-2.test
index c81286e..1181689 100755
--- a/tests/parallel-tests-dry-run-2.test
+++ b/tests/parallel-tests-dry-run-2.test
@@ -83,6 +83,7 @@ for target in check recheck test-suite.log; do
make_n_ $target
grep '^:test-result: *FAIL' bar.trs
grep 'this is bad' foo.log test-suite.log && Exit 1
+ : For shells with busted 'set -e'.
done
chmod a-rw $files
diff --git a/tests/parallel-tests-extra-programs.test
b/tests/parallel-tests-extra-programs.test
index 51d6ef3..aa99cb3 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/tests/parallel-tests-extra-programs.test
@@ -30,7 +30,7 @@ END
cat > Makefile.am << 'END'
TEST_EXTENSIONS = .bin .test
EXTRA_PROGRAMS =
-TESTS =
+TESTS =
END
#
diff --git a/tests/parallel-tests-unreadable.test
b/tests/parallel-tests-unreadable.test
index 2b4d077..425c31a 100755
--- a/tests/parallel-tests-unreadable.test
+++ b/tests/parallel-tests-unreadable.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -70,6 +70,7 @@ for files in \
grep '^SKIP: bar' test-suite.log
grep '^barbarbar$' test-suite.log
$EGREP ':.*foo|foofoofoo' test-suite.log && Exit 1
+ : For shells with busted 'set -e'.
done
:
diff --git a/tests/parallel-tests2.test b/tests/parallel-tests2.test
index a9ef964..ab0eee2 100755
--- a/tests/parallel-tests2.test
+++ b/tests/parallel-tests2.test
@@ -27,7 +27,10 @@ am_parallel_tests=yes
while :; do
for r2h in $RST2HTML rst2html rst2html.py; do
echo "$me: running $r2h --version"
- $r2h --version && break 2
+ # Don't use "&&" here, or a bug of 'set -e' present in some
+ # versions of the BSD shell will be triggered. We add the
+ # dummy "else" branch for extra safety.
+ if $r2h --version; then break 2; else :; fi
done
skip_all_ "no proper rst2html program found"
done
diff --git a/tests/python5.test b/tests/python5.test
index 8acbdfe..c67d92b 100755
--- a/tests/python5.test
+++ b/tests/python5.test
@@ -32,7 +32,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
-./configure >stdout 2>stderr && {
+./configure >stdout 2>stderr && {
cat stdout
cat stderr >&2
Exit 1
diff --git a/tests/tagsub.test b/tests/tagsub.test
index ca29406..7d449ea 100755
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2011, 2012 Free
+# Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure tags and subdirs work correctly. Bug report by
-# François Pinard, and later by Akim Demaille.
+# François Pinard, and later by Akim Demaille.
required=etags
. ./defs || Exit 1
diff --git a/tests/tap-fancy2.test b/tests/tap-fancy2.test
index b661146..8080861 100755
--- a/tests/tap-fancy2.test
+++ b/tests/tap-fancy2.test
@@ -113,7 +113,7 @@ total=`expr $pass + $fail + $xfail + $xpass + $skip`
# Even nastier! But accordingly to the specifics, it should still work.
for result in 'ok' 'not ok'; do
- echo "${result}{[(<#${tab}TODO>)]}" >> all.test
+ echo "${result}{[(<#${tab}TODO>)]}" >> all.test
done
echo "ok{[(<#${tab}SKIP>)]}" >> all.test
diff --git a/tests/test-driver-custom-multitest-recheck2.test
b/tests/test-driver-custom-multitest-recheck2.test
index 9f43b77..e7c183d 100755
--- a/tests/test-driver-custom-multitest-recheck2.test
+++ b/tests/test-driver-custom-multitest-recheck2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -105,7 +105,7 @@ for vpath in : false; do
done
unset var
- : a.test was sucessfull the first time, no need to re-run it.
+ : a.test was successful the first time, no need to re-run it.
env TESTS=a.test $MAKE -e recheck >stdout \
|| { cat stdout; Exit 1; }
cat stdout
@@ -173,7 +173,7 @@ for vpath in : false; do
rm -f *.run *.err *.ok
: Nothing should be rerun anymore, as all tests have been eventually
- : succesful.
+ : successful.
$MAKE recheck >stdout || { cat stdout; Exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/tests/test-driver-custom-no-extra-driver.test
b/tests/test-driver-custom-no-extra-driver.test
index 1196e77..18a94e4 100755
--- a/tests/test-driver-custom-no-extra-driver.test
+++ b/tests/test-driver-custom-no-extra-driver.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -58,6 +58,7 @@ for opts in '' '--add-missing' '-a -c'; do
$AUTOMAKE $opts
$FGREP test-driver Makefile.in sub[12]/Makefile.in && Exit 1
find . | $FGREP test-driver && Exit 1
+ : For shells with busted 'set -e'.
done
:
diff --git a/tests/test-metadata-recheck.test b/tests/test-metadata-recheck.test
index f3a3ef5..1d34ff1 100755
--- a/tests/test-metadata-recheck.test
+++ b/tests/test-metadata-recheck.test
@@ -158,6 +158,7 @@ for iteration in 1 2; do
ls -l
for t in $rechecked; do test -f $t.run; done
find . -name 'n-*.run' | grep . && Exit 1
+ : For shells with busted 'set -e'.
done
:
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
index f5c9587..09ac0b2 100755
--- a/tests/txinfo21.test
+++ b/tests/txinfo21.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2003, 2004, 2006, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2006, 2008, 2011, 2012 Free Software
+# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ cat >>configure.in <<\EOF
AC_CONFIG_FILES([rec/Makefile])
# At the time of writing, Autoconf does not supplies any of these
-# definitions (and those below are purposedly not those of the standard).
+# definitions (and those below are purposely not those of the standard).
AC_SUBST([dvidir], ['${datadir}/${PACKAGE}/dvi'])
AC_SUBST([htmldir], ['${datadir}/${PACKAGE}/html'])
AC_SUBST([pdfdir], ['${datadir}/${PACKAGE}/pdf'])
diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index aef08c1..ee153f4 100755
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -62,6 +62,7 @@ test -f parse.c
if cross_compiling; then :; else
echo a | ./foo
echo b | ./foo && Exit 1
+ : For shells with busted 'set -e'.
fi
# The generated file `parse.c' must be shipped.
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1828-gdec3c38,
Stefano Lattarini <=