[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-1648
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1648-g07cee98 |
|
Date: |
Tue, 27 Dec 2011 22:19:10 +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=07cee987e8b87aa78d641cd30fcb3b1d1c8c54fb
The branch, master has been updated
via 07cee987e8b87aa78d641cd30fcb3b1d1c8c54fb (commit)
via 4c38a8cee729ac47aa751364978f8315e1dff1fc (commit)
via 2fa8a9e975ce30702c87bd827b61f6e59ad98678 (commit)
via 58f034a3eebeaa1b16415fbb76e02fe378d6413f (commit)
from 6568eaae2dd2ca448fb2f499e2653d494f57c0a5 (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 07cee987e8b87aa78d641cd30fcb3b1d1c8c54fb
Author: Stefano Lattarini <address@hidden>
Date: Sat Dec 24 12:40:19 2011 +0100
regex: remove obsolete macro AM_WITH_REGEX
Today, practically nobody uses the GNU rx library, which, according
to its own website <http://www.gnu.org/software/rx/rx.html>, has
been "decommissioned". Consequently, the automake-provided macro
AM_WITH_REGEX is not used nor required anymore.
See also commits `v1.11-587-g5f335be' and `v1.11-433-g37b0aee',
where that macro had been deprecated.
* m4/regex.m4: Delete.
* m4/Makefile.am (dist_automake_ac_DATA): Do not list it anymore.
* doc/automake.texi (Obsolete Macros): Remove description, and in
fact any mention, of `AM_WITH_REGEX'.
* tests/regex.test: Delete.
* tests/help-regex.test: Likewise.
* tests/regex-obsolete.test: Likewise.
* tests/Makefile.am (TESTS): Do not list them anymore.
* NEWS: Update.
commit 4c38a8cee729ac47aa751364978f8315e1dff1fc
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 27 13:31:15 2011 +0100
cosmetics: be more consistent in copyright notices in tests
* tests/cond39.test: Update the heading copyright notice, to be
consistent with the formulation used in the other files.
* tests/cond40.test: Likewise.
* tests/cond41.test: Likewise.
* tests/cond42.test: Likewise.
* tests/cond43.test: Likewise.
* tests/conflnk4.test: Likewise.
* tests/extra8.test: Likewise.
* tests/extra9.test: Likewise.
* tests/suffix13.test: Likewise.
* tests/vala.test: Likewise.
* tests/vala1.test: Likewise.
* tests/vala2.test: Likewise.
* tests/vala3.test: Likewise.
* tests/vala4.test: Likewise.
* tests/vala5.test: Likewise.
* lib/Automake/tests/Condition.pl: Likewise.
* lib/Automake/tests/Condition-t.pl: Likewise.
* lib/Automake/tests/DisjConditions.pl: Likewise.
* lib/Automake/tests/DisjConditions-t.pl: Likewise.
* lib/Automake/tests/Version.pl: Likewise.
* lib/Automake/tests/Wrap.pl: Likewise.
* lib/Automake/tests/Cond2.pl: Add copyright notice.
* lib/Automake/tests/Cond3.pl: Likewise.
* lib/Automake/tests/DisjCon2.pl: Likewise.
* lib/Automake/tests/DisjCon3.pl: Likewise.
* lib/Automake/tests/Version2.pl: Likewise.
* lib/Automake/tests/Version3.pl: Likewise.
commit 2fa8a9e975ce30702c87bd827b61f6e59ad98678
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 27 11:45:59 2011 +0100
tap/awk: "Bail out!" recognized also after leading whitespace
Newer versions of TAP::Harness (e.g., 3.23 on Perl 5.14.1)
recognize a "Bail out!" directive also when it is prepended by
leading whitespace; this was not the case for older TAP:Harness
versions, (e.g., for version 3.17 on Perl 5.12.4), and for our
TAP driver implemented in awk.
* lib/tap-driver.sh: Handle the "Bail out!" directive also when
it is preceded by leading whitespace.
* tests/tap-spurious.test: Remove the tests checking that a
"Bail out!" string coming right after leading whitespace does
not trigger a bailout action.
* tests/tap-bailout-leading-space.test: New test.
* tests/list-of-tests.mk: Add it.
Problem reported by Jim Meyering in automake bug#10374.
commit 58f034a3eebeaa1b16415fbb76e02fe378d6413f
Author: Stefano Lattarini <address@hidden>
Date: Tue Dec 27 10:40:57 2011 +0100
tests: fix spurious failure of cond29.test
* tests/cond29.test: Limit the amount of virtual memory available
to the automake process to ~ 150 MB, rather than only ~ 20 MB, to
account for higher (but still acceptable) memory usages on some
systems (in this case, a Fedora 16 distro on ppc64). To be
sure not to reduce coverage, increase the number of potential
combinations of automake conditionals from 2**22 = 4194304 to
2**24 = 16777216.
We have actually verified that the new version of the test case
catches the Automake 1.7 it is intended to check against, using
the Automake 1.7.9 tarball downloaded from:
<http://ftp.gnu.org/gnu/automake/automake-1.7.9.tar.gz>
Reported by Jim Meyering in automake bug#10374.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 84 ++++++++++++++++++++++++++++++++
NEWS | 4 +-
doc/automake.texi | 17 +------
lib/Automake/tests/Cond2.pl | 16 ++++++
lib/Automake/tests/Cond3.pl | 16 ++++++
lib/Automake/tests/Condition-t.pl | 10 ++--
lib/Automake/tests/Condition.pl | 9 ++--
lib/Automake/tests/DisjCon2.pl | 16 ++++++
lib/Automake/tests/DisjCon3.pl | 16 ++++++
lib/Automake/tests/DisjConditions-t.pl | 10 ++--
lib/Automake/tests/DisjConditions.pl | 10 ++--
lib/Automake/tests/Version.pl | 8 +--
lib/Automake/tests/Version2.pl | 15 ++++++
lib/Automake/tests/Version3.pl | 15 ++++++
lib/Automake/tests/Wrap.pl | 8 +--
lib/tap-driver.sh | 10 +++-
m4/Makefile.am | 1 -
m4/regex.m4 | 56 ---------------------
tests/cond29.test | 18 +++++--
tests/cond39.test | 10 +---
tests/cond40.test | 10 +---
tests/cond41.test | 10 +---
tests/cond42.test | 10 +---
tests/cond43.test | 10 +---
tests/conflnk4.test | 10 +---
tests/extra8.test | 10 +---
tests/extra9.test | 14 ++---
tests/help-regex.test | 31 ------------
tests/list-of-tests.mk | 4 +-
tests/regex-obsolete.test | 30 -----------
tests/regex.test | 29 -----------
tests/suffix13.test | 10 +---
tests/tap-bailout-leading-space.test | 72 +++++++++++++++++++++++++++
tests/tap-no-spurious.test | 3 +-
tests/vala.test | 10 +---
tests/vala1.test | 10 +---
tests/vala2.test | 10 +---
tests/vala3.test | 10 +---
tests/vala4.test | 10 +---
tests/vala5.test | 10 +---
40 files changed, 344 insertions(+), 318 deletions(-)
delete mode 100644 m4/regex.m4
delete mode 100755 tests/help-regex.test
delete mode 100755 tests/regex-obsolete.test
delete mode 100755 tests/regex.test
create mode 100755 tests/tap-bailout-leading-space.test
diff --git a/ChangeLog b/ChangeLog
index dfe666a..697651a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+2011-12-27 Stefano Lattarini <address@hidden>
+
+ regex: remove obsolete macro AM_WITH_REGEX
+ Today, practically nobody uses the GNU rx library, which, according
+ to its own website <http://www.gnu.org/software/rx/rx.html>, has
+ been "decommissioned". Consequently, the automake-provided macro
+ AM_WITH_REGEX is not used nor required anymore.
+ * m4/regex.m4: Delete.
+ * m4/Makefile.am (dist_automake_ac_DATA): Do not list it anymore.
+ * doc/automake.texi (Obsolete Macros): Remove description, and in
+ fact any mention, of `AM_WITH_REGEX'.
+ * tests/regex.test: Delete.
+ * tests/help-regex.test: Likewise.
+ * tests/regex-obsolete.test: Likewise.
+ * tests/list-of-tests.mk: Do not list them anymore.
+ * NEWS: Update.
+ See also commits `v1.11-587-g5f335be' and `v1.11-433-g37b0aee',
+ where that macro had been deprecated.
+
+2011-12-27 Stefano Lattarini <address@hidden>
+
+ cosmetics: be more consistent in copyright notices in tests
+ * tests/cond39.test: Update the heading copyright notice, to be
+ consistent with the formulation used in the other files.
+ * tests/cond40.test: Likewise.
+ * tests/cond41.test: Likewise.
+ * tests/cond42.test: Likewise.
+ * tests/cond43.test: Likewise.
+ * tests/conflnk4.test: Likewise.
+ * tests/extra8.test: Likewise.
+ * tests/extra9.test: Likewise.
+ * tests/suffix13.test: Likewise.
+ * tests/vala.test: Likewise.
+ * tests/vala1.test: Likewise.
+ * tests/vala2.test: Likewise.
+ * tests/vala3.test: Likewise.
+ * tests/vala4.test: Likewise.
+ * tests/vala5.test: Likewise.
+ * lib/Automake/tests/Condition.pl: Likewise.
+ * lib/Automake/tests/Condition-t.pl: Likewise.
+ * lib/Automake/tests/DisjConditions.pl: Likewise.
+ * lib/Automake/tests/DisjConditions-t.pl: Likewise.
+ * lib/Automake/tests/Version.pl: Likewise.
+ * lib/Automake/tests/Wrap.pl: Likewise.
+ * lib/Automake/tests/Cond2.pl: Add copyright notice.
+ * lib/Automake/tests/Cond3.pl: Likewise.
+ * lib/Automake/tests/DisjCon2.pl: Likewise.
+ * lib/Automake/tests/DisjCon3.pl: Likewise.
+ * lib/Automake/tests/Version2.pl: Likewise.
+ * lib/Automake/tests/Version3.pl: Likewise.
+
+2011-12-27 Stefano Lattarini <address@hidden>
+
+ tap/awk: "Bail out!" recognized also after leading whitespace
+ Newer versions of TAP::Harness (e.g., 3.23 on Perl 5.14.1)
+ recognize a "Bail out!" directive also when it is prepended by
+ leading whitespace; this was not the case for older TAP:Harness
+ versions, (e.g., for version 3.17 on Perl 5.12.4), and for our
+ TAP driver implemented in awk.
+ * lib/tap-driver.sh: Handle the "Bail out!" directive also when
+ it is preceded by leading whitespace.
+ * tests/tap-spurious.test: Remove the tests checking that a
+ "Bail out!" string coming right after leading whitespace does
+ not trigger a bailout action.
+ * tests/tap-bailout-leading-space.test: New test.
+ * tests/list-of-tests.mk: Add it.
+ Problem reported by Jim Meyering in automake bug#10374.
+
+2011-12-27 Stefano Lattarini <address@hidden>
+
+ tests: fix spurious failure of cond29.test
+ * tests/cond29.test: Limit the amount of virtual memory available
+ to the automake process to ~ 150 MB, rather than only ~ 20 MB, to
+ account for higher (but still acceptable) memory usages on some
+ systems (in this case, a Fedora 16 distro on ppc64). To be
+ sure not to reduce coverage, increase the number of potential
+ combinations of automake conditionals from 2**22 = 4194304 to
+ 2**24 = 16777216.
+ We have actually verified that the new version of the test case
+ catches the Automake 1.7 it is intended to check against, using
+ the Automake 1.7.9 tarball downloaded from:
+ <http://ftp.gnu.org/gnu/automake/automake-1.7.9.tar.gz>
+ Reported by Jim Meyering in automake bug#10374.
+
2011-12-24 Stefano Lattarini <address@hidden>
gitignore: use only one .gitignore file, in the top-level directory
diff --git a/NEWS b/NEWS
index 09906f6..813e6f4 100644
--- a/NEWS
+++ b/NEWS
@@ -7,9 +7,7 @@ New in 1.11a:
- The deprecated options `--output-dir', `--Werror' and `--Wno-error'
have been removed.
- - The obsolescent AM_WITH_REGEX macro has been deprecated (since the
- GNU rx library has been decommissioned), and will be removed in the
- next major Automake release (1.12).
+ - The obsolete AM_WITH_REGEX macro has been removed.
* Changes to aclocal:
diff --git a/doc/automake.texi b/doc/automake.texi
index cfc800e..62dcfba 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4163,21 +4163,6 @@ system. If so, set the shell variable
@code{am_cv_sys_posix_termios} to
@samp{yes}. If not, set the variable to @samp{no}. This macro is obsolete,
you should use Autoconf's @code{AC_SYS_POSIX_TERMIOS} instead.
address@hidden AM_WITH_REGEX
address@hidden AM_WITH_REGEX
address@hidden WITH_REGEX
address@hidden --with-regex
address@hidden regex package
address@hidden rx package
-Adds @option{--with-regex} to the @command{configure} command line. If
-specified (the default), then the @samp{regex} regular expression
-library is used, @file{regex.o} is put into @code{LIBOBJS}, and
address@hidden is defined. If @option{--without-regex} is given, then
-the @samp{rx} regular expression library is used, and @file{rx.o} is put
-into @code{LIBOBJS}. This macro is obsolete now (since @samp{rx} doesn't
-seem to be maintained), and @emph{will be removed the next major version
-of Automake}. Consider using gnulib if you need regex functionality.
-
@end table
@@ -14304,7 +14289,7 @@ parentheses is the number of generated test cases.
@c LocalWords: dirlist noindent usr MULTILIB multilib Multilibs TIOCGWINSZ sc
@c LocalWords: GWINSZ termios SRCDIR tarball bzip LISPDIR lispdir XEmacs CCAS
@c LocalWords: emacsen MicroEmacs CCASFLAGS UX GCJ gcj GCJFLAGS posix DMALLOC
address@hidden LocalWords: dmalloc ldmalloc REGEX regex rx DEPDIR DEP DEFUN
aclocaldir fi
address@hidden LocalWords: dmalloc ldmalloc REGEX regex DEPDIR DEP DEFUN
aclocaldir fi
@c LocalWords: mymacro myothermacro AMFLAGS autopoint autogen libtoolize yum
@c LocalWords: autoheader README MAKEFLAGS subdir Inetutils sync COND endif
@c LocalWords: Miller's installable includedir inc pkgdata EXEEXT libexec bsd
diff --git a/lib/Automake/tests/Cond2.pl b/lib/Automake/tests/Cond2.pl
index 4ad0e1c..94caa89 100644
--- a/lib/Automake/tests/Cond2.pl
+++ b/lib/Automake/tests/Cond2.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Catch common programming error:
# A Condition passed as a string to 'new'.
+
use Automake::Condition;
my $cond = new Automake::Condition ('TRUE');
diff --git a/lib/Automake/tests/Cond3.pl b/lib/Automake/tests/Cond3.pl
index dc957af..e010e4f 100644
--- a/lib/Automake/tests/Cond3.pl
+++ b/lib/Automake/tests/Cond3.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Catch common programming error:
# A Condition passed as a string to 'new'.
+
use Automake::Condition;
my $cond = new Automake::Condition ("COND1_TRUE");
diff --git a/lib/Automake/tests/Condition-t.pl
b/lib/Automake/tests/Condition-t.pl
index 99004ac..752d340 100644
--- a/lib/Automake/tests/Condition-t.pl
+++ b/lib/Automake/tests/Condition-t.pl
@@ -1,14 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl
index e330e53..1c65484 100644
--- a/lib/Automake/tests/Condition.pl
+++ b/lib/Automake/tests/Condition.pl
@@ -1,13 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/lib/Automake/tests/DisjCon2.pl b/lib/Automake/tests/DisjCon2.pl
index 9edd8d5..37d886a 100644
--- a/lib/Automake/tests/DisjCon2.pl
+++ b/lib/Automake/tests/DisjCon2.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Catch common programming error:
# A non-Condition reference passed to new.
+
use Automake::Condition;
use Automake::DisjConditions;
diff --git a/lib/Automake/tests/DisjCon3.pl b/lib/Automake/tests/DisjCon3.pl
index 8e69e2b..c0e840d 100644
--- a/lib/Automake/tests/DisjCon3.pl
+++ b/lib/Automake/tests/DisjCon3.pl
@@ -1,5 +1,21 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Catch common programming error:
# A non-reference passed to new.
+
use Automake::Condition qw/TRUE FALSE/;
use Automake::DisjConditions;
diff --git a/lib/Automake/tests/DisjConditions-t.pl
b/lib/Automake/tests/DisjConditions-t.pl
index 4df5112..4acaed8 100644
--- a/lib/Automake/tests/DisjConditions-t.pl
+++ b/lib/Automake/tests/DisjConditions-t.pl
@@ -1,14 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/lib/Automake/tests/DisjConditions.pl
b/lib/Automake/tests/DisjConditions.pl
index 7ccac13..b60907b 100644
--- a/lib/Automake/tests/DisjConditions.pl
+++ b/lib/Automake/tests/DisjConditions.pl
@@ -1,14 +1,12 @@
-# Copyright (C) 2001, 2002, 2003, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2002, 2003, 2008, 2009, 2011 Free Software
+# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/lib/Automake/tests/Version.pl b/lib/Automake/tests/Version.pl
index bea91f0..eec0c8e 100644
--- a/lib/Automake/tests/Version.pl
+++ b/lib/Automake/tests/Version.pl
@@ -1,13 +1,11 @@
-# Copyright (C) 2002, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2009, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/lib/Automake/tests/Version2.pl b/lib/Automake/tests/Version2.pl
index 038466d..c1981a0 100644
--- a/lib/Automake/tests/Version2.pl
+++ b/lib/Automake/tests/Version2.pl
@@ -1,3 +1,18 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# prog_error due to invalid $VERSION.
use Automake::Version;
diff --git a/lib/Automake/tests/Version3.pl b/lib/Automake/tests/Version3.pl
index ebac23f..7c45dc9 100644
--- a/lib/Automake/tests/Version3.pl
+++ b/lib/Automake/tests/Version3.pl
@@ -1,3 +1,18 @@
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# prog_error due to invalid $REQUIRED.
use Automake::Version;
diff --git a/lib/Automake/tests/Wrap.pl b/lib/Automake/tests/Wrap.pl
index b415401..79b8d32 100644
--- a/lib/Automake/tests/Wrap.pl
+++ b/lib/Automake/tests/Wrap.pl
@@ -1,13 +1,11 @@
-# Copyright (C) 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2009, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index c911991..c011298 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -23,7 +23,7 @@
# bugs to <address@hidden> or send patches to
# <address@hidden>.
-scriptversion=2011-09-28.14; # UTC
+scriptversion=2011-12-27.17; # UTC
# Make unconditional expansion of undefined variables an error. This
# helps a lot in preventing typo-related bugs.
@@ -573,12 +573,16 @@ while (1)
handle_tap_plan(0, $0)
}
# "Bail out!" magic.
- else if ($0 ~ /^Bail out!/)
+ # Older versions of prove and TAP::Harness (e.g., 3.17) did not
+ # recognize a "Bail out!" directive when preceded by leading
+ # whitespace, but more modern versions (e.g., 3.23) do. So we
+ # emulate the latter, "more modern" behaviour.
+ else if ($0 ~ /^[ \t]*Bail out!/)
{
bailed_out = 1
# Get the bailout message (if any), with leading and trailing
# whitespace stripped. The message remains stored in `$0`.
- sub("^Bail out![ \t]*", "");
+ sub("^[ \t]*Bail out![ \t]*", "");
sub("[ \t]*$", "");
# Format the error message for the
bailout_message = "Bail out!"
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d04ec9d..87243cb 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -48,7 +48,6 @@ obsolete.m4 \
options.m4 \
protos.m4 \
python.m4 \
-regex.m4 \
runlog.m4 \
sanity.m4 \
silent.m4 \
diff --git a/m4/regex.m4 b/m4/regex.m4
deleted file mode 100644
index 8eeec68..0000000
--- a/m4/regex.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-## --------------------------------- ## -*- Autoconf -*-
-## Check if --with-regex was given. ##
-## --------------------------------- ##
-# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2010, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 15
-
-# AM_WITH_REGEX
-# -------------
-#
-# THIS MACRO IS OBSOLETE now, since rx doesn't seem to be maintained,
-# while regex is. This macro should be removed in the next major
-# automake version (1.12).
-#
-# The idea is to distribute rx.[hc] and regex.[hc] together, for a
-# while. The WITH_REGEX symbol is used to decide which of regex.h or
-# rx.h should be included in the application. If `./configure
-# --with-regex' is given (the default), the package will use gawk's
-# regex. If `./configure --without-regex', a check is made to see if
-# rx is already installed, as with newer Linux'es. If not found, the
-# package will use the rx from the distribution. If found, the
-# package will use the system's rx which, on Linux at least, will
-# result in a smaller executable file.
-#
-AC_DEFUN([AM_WITH_REGEX],
-[AC_PREREQ(2.50)dnl
-m4_warn([obsolete], [$0 is obsolete, since GNU rx is unmantained now])dnl
-AC_LIBSOURCES([rx.h, rx.c, regex.c, regex.h])dnl
-AC_MSG_CHECKING([which of GNU rx or gawk's regex is wanted])
-AC_ARG_WITH([regex],
-[ --without-regex use GNU rx in lieu of gawk's regex for matching],
- [test "$withval" = yes && am_with_regex=1],
- [am_with_regex=1])
-if test -n "$am_with_regex"; then
- AC_MSG_RESULT([regex])
- AC_DEFINE([WITH_REGEX], 1, [Define if using GNU regex])
- AC_CACHE_CHECK([for GNU regex in libc], [am_cv_gnu_regex],
- [AC_TRY_LINK([],
- [extern int re_max_failures; re_max_failures = 1],
- [am_cv_gnu_regex=yes],
- [am_cv_gnu_regex=no])])
- if test $am_cv_gnu_regex = no; then
- AC_LIBOBJ([regex])
- fi
-else
- AC_MSG_RESULT([rx])
- AC_CHECK_FUNC([re_rx_search], , [AC_LIBOBJ([rx])])
-fi[]dnl
-])
-
-AU_DEFUN([fp_WITH_REGEX], [AM_WITH_REGEX])
diff --git a/tests/cond29.test b/tests/cond29.test
index 3361081..98cbe87 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -27,16 +27,24 @@ a02_LDADD =
a03_SOURCES =
EOF
-# On this test, Automake 1.7.x would compute all 2**22 = 4194304
+# On this test, Automake 1.7.x would compute all 2**24 = 16777216
# possible combinations of conditionals (it would do this five times,
# to define a01_DEPENDENCIES, a02_DEPENDENCIES, a03_OBJECTS,
# a04_OBJECTS, and to rewrite bin_PROGRAM), eating all memory, swap,
# or cpu time it can found.
+# Limit memory available to spawned processes to ~ 150 MB. Considering
+# that 70 MB is enough for x86_64 Fedora 16, that gives tools and
+# libraries plenty of room to grow. Suggested by Jim Meyering in
+# automake bug#10374.
(ulimit -v 1; sh -c ":") && skip_ "no adequate 'ulimit' builtin found"
-(ulimit -v 20000; sh -c ":") || skip_ "no adequate 'ulimit' builtin found"
-ulimit -v 20000
-
-for i in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22; do
+(ulimit -v 150000; sh -c ":") || skip_ "no adequate 'ulimit' builtin found"
+ulimit -v 150000
+
+for i in \
+ 01 02 03 04 05 06 07 08 09 10 \
+ 11 12 13 14 15 16 17 18 19 20 \
+ 21 22 23 24
+do
unindent >>Makefile.am <<EOF
if C$i
bin_PROGRAMS += a$i
diff --git a/tests/cond39.test b/tests/cond39.test
index f6a916e..ac64be3 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -1,22 +1,18 @@
#!/bin/sh
# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Build either as CONFIG_FILE or as PROGRAM.
diff --git a/tests/cond40.test b/tests/cond40.test
index e0ffbd2..1b62bfc 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -1,22 +1,18 @@
#! /bin/sh
# Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test AM_COND_IF.
diff --git a/tests/cond41.test b/tests/cond41.test
index c3778c1..b91500f 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -1,22 +1,18 @@
#!/bin/sh
# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# AM_COND_IF with an undefined condition should fail.
diff --git a/tests/cond42.test b/tests/cond42.test
index 9ae88cc..2f603e8 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -1,22 +1,18 @@
#!/bin/sh
# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Ensure an error with inconsistent state of conditionals in configure.ac.
# This shouldn't happen with user input, as _AM_COND_* are not documented,
diff --git a/tests/cond43.test b/tests/cond43.test
index d112bd7..aafb46b 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -1,22 +1,18 @@
#!/bin/sh
# Copyright (C) 2008, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
diff --git a/tests/conflnk4.test b/tests/conflnk4.test
index 7597087..eb226ad 100755
--- a/tests/conflnk4.test
+++ b/tests/conflnk4.test
@@ -1,22 +1,18 @@
#! /bin/sh
# Copyright (C) 2003, 2008, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get
# removed with `make distclean' only if doing a VPATH build.
diff --git a/tests/extra8.test b/tests/extra8.test
index 9d729eb..57bbe56 100755
--- a/tests/extra8.test
+++ b/tests/extra8.test
@@ -1,22 +1,18 @@
#!/bin/sh
# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Ensure defining bin_PROGRAMS in terms of EXTRA_PROGRAMS works,
# and that referring to the same program with inconsistent addition
diff --git a/tests/extra9.test b/tests/extra9.test
index 7a9cdaa..ac1e0a8 100755
--- a/tests/extra9.test
+++ b/tests/extra9.test
@@ -1,22 +1,18 @@
#!/bin/sh
# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Ensure we warn about substitutions in bin_PROGRAMS if EXTRA_PROGRAMS
# are missing; but only if the former is not AC_SUBSTed itself
diff --git a/tests/help-regex.test b/tests/help-regex.test
deleted file mode 100755
index 2ae7704..0000000
--- a/tests/help-regex.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure that obsolescent macro `AM_WITH_REGEX' adds proper text to
-# the configure help screen.
-
-. ./defs || Exit 1
-
-cat > configure.in <<END
-AC_INIT([$me], [1.0])
-AM_WITH_REGEX
-END
-
-$ACLOCAL
-$AUTOCONF
-grep_configure_help --without-regex ' use GNU rx($| )'
-
-:
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 71a7693..8419355 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -441,7 +441,6 @@ help-init.test \
help-lispdir.test \
help-multilib.test \
help-python.test \
-help-regex.test \
help-silent.test \
help-upc.test \
hfs.test \
@@ -868,8 +867,6 @@ remake-deleted-am.test \
remake-am-pr10111.test \
remake-m4-pr10111.test \
pr8365-remake-timing.test \
-regex.test \
-regex-obsolete.test \
req.test \
reqd.test \
reqd2.test \
@@ -1001,6 +998,7 @@ syntax.test \
tap-ambiguous-directive.test \
tap-autonumber.test \
tap-bailout.test \
+tap-bailout-leading-space.test \
tap-bailout-and-logging.test \
tap-bailout-suppress-badexit.test \
tap-bailout-suppress-later-diagnostic.test \
diff --git a/tests/regex-obsolete.test b/tests/regex-obsolete.test
deleted file mode 100755
index b156309..0000000
--- a/tests/regex-obsolete.test
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Check that the AM_WITH_REGEX macro is reported as obsolete.
-
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AM_WITH_REGEX
-END
-
-$ACLOCAL
-$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '^configure\.in:.*AM_WITH_REGEX.*obsolete' stderr
-
-:
diff --git a/tests/regex.test b/tests/regex.test
deleted file mode 100755
index 586ab5a..0000000
--- a/tests/regex.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Make sure AM_WITH_REGEX compiles and runs.
-
-required=cc
-. ./defs || Exit 1
-
-cat >> configure.in << 'END'
-AM_WITH_REGEX
-END
-
-$ACLOCAL
-$AUTOCONF
-./configure
-./configure --without-regex
diff --git a/tests/suffix13.test b/tests/suffix13.test
index 756d83e..3eaf8d2 100755
--- a/tests/suffix13.test
+++ b/tests/suffix13.test
@@ -2,22 +2,18 @@
# Copyright (C) 2002, 2003, 2006, 2009, 2010, 2011 Free Software
# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Tests that Automake understands suffix rules with renamed objects
# and subdir objects.
diff --git a/tests/tap-bailout-leading-space.test
b/tests/tap-bailout-leading-space.test
new file mode 100755
index 0000000..1615c09
--- /dev/null
+++ b/tests/tap-bailout-leading-space.test
@@ -0,0 +1,72 @@
+#! /bin/sh
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Older versions of prove and TAP::Harness (e.g., 3.17) didn't recognize
+# a "Bail out!" directive that was preceded by whitespace, but more modern
+# versions (e.g., 3.23) do. So we leave this behaviour undefined for the
+# perl implementation of the Automake TAP driver, but expect the latter,
+# "more modern" behaviour in our awk TAP driver.
+
+am_parallel_tests=yes
+am_tap_implementation=shell
+. ./defs || Exit 1
+
+. "$testsrcdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+cat > a.test <<END
+1..1
+ok 1
+ Bail out!
+END
+
+cat > b.test <<END
+1..1
+ok 1 # SKIP
+${tab}Bail out!
+END
+
+cat > c.test <<END
+1..1
+ ${tab} ${tab}${tab}Bail out! FUBAR! $tab
+END
+
+cat >> exp <<END
+PASS: a.test 1
+ERROR: a.test - Bail out!
+SKIP: b.test 1
+ERROR: b.test - Bail out!
+ERROR: c.test - Bail out! FUBAR!
+END
+
+TESTS='a.test b.test c.test' $MAKE -e check >stdout \
+ && { cat stdout; Exit 1; }
+cat stdout
+
+count_test_results total=5 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=3
+
+LC_ALL=C sort exp > t
+mv -f t exp
+
+# We need the sort below to account for parallel make usage.
+grep ': [abcde]\.test' stdout \
+ | sed "s/[ $tab]*#[ $tab]*SKIP.*//" \
+ | LC_ALL=C sort > got
+
+cat exp
+cat got
+diff exp got
+
+:
diff --git a/tests/tap-no-spurious.test b/tests/tap-no-spurious.test
index bf3d7ae..c2d5bc5 100755
--- a/tests/tap-no-spurious.test
+++ b/tests/tap-no-spurious.test
@@ -84,6 +84,8 @@ set -x # Reset shell xtraces.
# The prove(1) utility doesn't bail out on these, so our driver
# shouldn't either.
+# See comments in `tap-bailout-leading-space.test' for an explanation
+# of why we don't have a whitespace-prepended "Bail out!" line here.
cat >> all.test <<'END'
bailout
bailout!
@@ -93,7 +95,6 @@ Bailout
Bailout!
Bail out
Bail out
- Bail out!
#Bail out!
# Bail out!
END
diff --git a/tests/vala.test b/tests/vala.test
index 6954dbd..959990a 100755
--- a/tests/vala.test
+++ b/tests/vala.test
@@ -2,22 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure intermediate .c files are built from vala source.
diff --git a/tests/vala1.test b/tests/vala1.test
index 7eb8d71..ab72025 100755
--- a/tests/vala1.test
+++ b/tests/vala1.test
@@ -2,22 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure intermediate .c files are built from vala sources
# in non-recursive automake mode.
diff --git a/tests/vala2.test b/tests/vala2.test
index 55e9b8e..85534d9 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -2,22 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure compiling Vala code really works with recursive make.
diff --git a/tests/vala3.test b/tests/vala3.test
index 8de96d6..338ca60 100755
--- a/tests/vala3.test
+++ b/tests/vala3.test
@@ -2,22 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure compiling Vala code really works with non-recursive make.
diff --git a/tests/vala4.test b/tests/vala4.test
index a7e6a71..6924c04 100755
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -1,22 +1,18 @@
#! /bin/sh
# Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test AM_PROG_VALAC.
diff --git a/tests/vala5.test b/tests/vala5.test
index 66cffe7..f3062e7 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -2,22 +2,18 @@
# Copyright (C) 1996, 2001, 2002, 2006, 2008, 2009, 2011 Free Software
# Foundation, Inc.
#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
-# GNU Automake is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with Automake; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test per-target flags.
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1648-g07cee98,
Stefano Lattarini <=