[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-214-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-214-g28712ef |
|
Date: |
Sun, 06 Jun 2010 20:01:32 +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=28712ef1ec808de1e3dffcf54671b64be4394626
The branch, master has been updated
via 28712ef1ec808de1e3dffcf54671b64be4394626 (commit)
via e169272745c2fdc18e1f07cbe3bc5bcdbb5982aa (commit)
via afd7cefb2083816ab1e7126e1ed39d2fd9868230 (commit)
via 6f880d1558d240ba33afd37456755fc382b0f5d2 (commit)
via 5fabe248b3cd23ebeb3f7382bf7dd2cf7518bcbd (commit)
via 9d39d3f58880cb285cd35d2f67534aa322d01e58 (commit)
via e3c82b94ea7dbfef8ec6eb7a689a77a8a6cd7e1f (commit)
via ce6dfb3b0e56e3f742adec8d40f94475066dc553 (commit)
from 80709460757a0858585e3275e0a06998db635f5b (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 28712ef1ec808de1e3dffcf54671b64be4394626
Merge: e169272745c2fdc18e1f07cbe3bc5bcdbb5982aa
afd7cefb2083816ab1e7126e1ed39d2fd9868230
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 21:59:37 2010 +0200
Merge branch 'perl-coverage'
commit e169272745c2fdc18e1f07cbe3bc5bcdbb5982aa
Merge: ce6dfb3b0e56e3f742adec8d40f94475066dc553
e3c82b94ea7dbfef8ec6eb7a689a77a8a6cd7e1f
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 21:59:30 2010 +0200
Merge branch 'maint'
commit afd7cefb2083816ab1e7126e1ed39d2fd9868230
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 19:48:52 2010 +0200
Coverage for TAGS_DEPENDENCIES warning.
* tests/tags2.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 6f880d1558d240ba33afd37456755fc382b0f5d2
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 19:46:11 2010 +0200
Coverage for use of anachronistic variables.
* tests/oldvars.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 5fabe248b3cd23ebeb3f7382bf7dd2cf7518bcbd
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 19:45:16 2010 +0200
Testsuite coverage for bogus macro file serial numbers.
* tests/acloca18.test: Also test ill-formed serial numbers
and serial numbers after macro definitions.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 9d39d3f58880cb285cd35d2f67534aa322d01e58
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 19:44:10 2010 +0200
Coverage for aclocal diagnosing underquoted macros.
* tests/acloca23.test: New test.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit ce6dfb3b0e56e3f742adec8d40f94475066dc553
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 16:55:08 2010 +0200
More minor message fixes.
* aclocal.in (scan_file): Fix recommended info command line.
* automake.in (handle_lib_objects): No need to prepend function
name to prog_error message.
(handle_tags): Add missing word and missing space in error
message.
(handle_dist): Add missing closing single quote in message.
Line-wrap one long message for readability.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 37 ++++++++++++++++++++++++++++++++
aclocal.in | 2 +-
automake.in | 12 +++++-----
tests/Makefile.am | 3 ++
tests/Makefile.in | 3 ++
tests/acloca18.test | 19 +++++++++++++++-
tests/{acloca16.test => acloca23.test} | 19 ++++++++-------
tests/ldadd.test | 8 +++++-
tests/mdate.test | 8 +++++-
tests/{lex2.test => oldvars.test} | 27 ++++++++++++-----------
tests/{xsource.test => tags2.test} | 31 ++++++++++++++------------
11 files changed, 121 insertions(+), 48 deletions(-)
copy tests/{acloca16.test => acloca23.test} (70%)
copy tests/{lex2.test => oldvars.test} (69%)
copy tests/{xsource.test => tags2.test} (66%)
diff --git a/ChangeLog b/ChangeLog
index 4f94715..5a5de1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2010-06-06 Ralf Wildenhues <address@hidden>
+
+ Coverage for TAGS_DEPENDENCIES warning.
+ * tests/tags2.test: New test.
+ * tests/Makefile.am: Update.
+
+ Coverage for use of anachronistic variables.
+ * tests/oldvars.test: New test.
+ * tests/Makefile.am: Update.
+
+ Testsuite coverage for bogus macro file serial numbers.
+ * tests/acloca18.test: Also test ill-formed serial numbers
+ and serial numbers after macro definitions.
+
+ Coverage for aclocal diagnosing underquoted macros.
+ * tests/acloca23.test: New test.
+ * tests/Makefile.am: Update.
+
+2010-06-06 Ralf Wildenhues <address@hidden>
+
+ Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
+ * tests/ldadd.test: Enable errexit. Use AUTOMAKE_fails so
+ the verbose log contains all output.
+ * tests/mdate.test: Likewise.
+ Prompted by Stefano Lattarini's change to discover.test.
+
+2010-06-06 Ralf Wildenhues <address@hidden>
+
+ More minor message fixes.
+ * aclocal.in (scan_file): Fix recommended info command line.
+ * automake.in (handle_lib_objects): No need to prepend function
+ name to prog_error message.
+ (handle_tags): Add missing word and missing space in error
+ message.
+ (handle_dist): Add missing closing single quote in message.
+ Line-wrap one long message for readability.
+
2010-06-06 Stefano Lattarini <address@hidden>
Ralf Wildenhues <address@hidden>
diff --git a/aclocal.in b/aclocal.in
index 06d69ed..182e4f7 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -559,7 +559,7 @@ sub scan_file ($$$)
if (! defined $1)
{
msg ('syntax', "$file:$.", "underquoted definition of $2"
- . "\n run info '(automake)Extending aclocal'\n"
+ . "\n run info Automake 'Extending aclocal'\n"
. " or see http://sources.redhat.com/automake/";
. "automake.html#Extending-aclocal")
unless $underquoted_manual_once;
diff --git a/automake.in b/automake.in
index 05b8711..be336a1 100644
--- a/automake.in
+++ b/automake.in
@@ -2317,9 +2317,9 @@ sub handle_lib_objects
my ($xname, $varname) = @_;
my $var = var ($varname);
- prog_error "handle_lib_objects: `$varname' undefined"
+ prog_error "`$varname' undefined"
unless $var;
- prog_error "handle_lib_objects: unexpected variable name `$varname'"
+ prog_error "unexpected variable name `$varname'"
unless $varname =~ /^(.*)(?:LIB|LD)ADD$/;
my $prefix = $1 || 'AM_';
@@ -2352,7 +2352,7 @@ sub handle_lib_objects
# FIXME: should display a stack of nested variables
# as context when $var != $subvar.
err_var ($var, "linker flags such as `$val' belong in "
- . "`${prefix}LDFLAGS");
+ . "`${prefix}LDFLAGS'");
}
return ();
}
@@ -3822,8 +3822,8 @@ sub handle_tags
set_seen 'TAGS_DEPENDENCIES';
}
elsif (reject_var ('TAGS_DEPENDENCIES',
- "doesn't make sense to define `TAGS_DEPENDENCIES'"
- . "without\nsources or `ETAGS_ARGS'"))
+ "it doesn't make sense to define `TAGS_DEPENDENCIES'"
+ . " without\nsources or `ETAGS_ARGS'"))
{
}
else
@@ -3946,7 +3946,7 @@ sub handle_dist ()
$archive_defined ||=
grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip lzma xz);
error (option 'no-dist-gzip',
- "no-dist-gzip specified but no dist-* specified, "
+ "no-dist-gzip specified but no dist-* specified,\n"
. "at least one archive format must be enabled")
unless $archive_defined;
}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f709593..361294b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -66,6 +66,7 @@ acloca19.test \
acloca20.test \
acloca21.test \
acloca22.test \
+acloca23.test \
acoutnoq.test \
acoutpt.test \
acoutpt2.test \
@@ -517,6 +518,7 @@ number.test \
objc.test \
objc2.test \
obsolete.test \
+oldvars.test \
order.test \
outdir.test \
output.test \
@@ -709,6 +711,7 @@ symlink2.test \
symlink3.test \
syntax.test \
tags.test \
+tags2.test \
tagsub.test \
tar.test \
tar2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 36fb41e..a259a36 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -304,6 +304,7 @@ acloca19.test \
acloca20.test \
acloca21.test \
acloca22.test \
+acloca23.test \
acoutnoq.test \
acoutpt.test \
acoutpt2.test \
@@ -755,6 +756,7 @@ number.test \
objc.test \
objc2.test \
obsolete.test \
+oldvars.test \
order.test \
outdir.test \
output.test \
@@ -947,6 +949,7 @@ symlink2.test \
symlink3.test \
syntax.test \
tags.test \
+tags2.test \
tagsub.test \
tar.test \
tar2.test \
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 276e5ba..6f2de7e 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -25,7 +25,7 @@ AM_MACRO1
AM_MACRO2
END
-mkdir 1 2 3 4
+mkdir 1 2 3 4 5 6
cat >1/m1.m4 <<EOF
#serial 1.8.1230.9
@@ -53,6 +53,17 @@ cat >4/mumble.m4 <<EOF
AC_DEFUN([AM_MACRO1], [echo macro14 >> foo])
EOF
+cat >5/ill-formed.m4 <<EOF
+#serial bla
+#serial .2
+#serial
+AC_DEFUN([AM_MACRO1], [echo macro15 >> foo])
+EOF
+
+cat >6/after-def.m4 <<EOF
+AC_DEFUN([AM_MACRO1], [echo macro16 >> foo])
+#serial 1
+EOF
ACLOCAL_TESTSUITE_FLAGS='-I 1 -I 2 -I 3 -I 4'
@@ -112,3 +123,9 @@ cat output
grep '#serial 456' output
test ! -f 4/m1.m4
grep 'installing.*4/m1.m4' stderr
+
+$ACLOCAL -I 5 2>stderr && { cat stderr >&2; Exit 1; }
+test `grep -c 'ill-formed serial' stderr` -eq 3
+
+$ACLOCAL -I 6 2>stderr && { cat stderr >&2; Exit 1; }
+grep 'serial.*before any macro definition' stderr
diff --git a/tests/acloca16.test b/tests/acloca23.test
similarity index 70%
copy from tests/acloca16.test
copy to tests/acloca23.test
index 93bde8b..1741e70 100755
--- a/tests/acloca16.test
+++ b/tests/acloca23.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,23 +14,24 @@
# 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 aclocal does not include definitions that are not actually
-# evaluated.
+# Ensure we diagnose underquoted AC_DEFUN's.
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
-AC_SUBST([POM])
+FOO
END
mkdir m4
-cat >m4/some.m4 <<'EOF'
-AC_DEFUN([AM_SOME_MACRO],
-[AC_DEFUN([AC_SUBST], [GREPME])])
+cat >m4/foo.m4 <<EOF
+AC_DEFUN(FOO, [echo foo])
EOF
-$ACLOCAL -I m4
-grep m4/some.m4 aclocal.m4 && Exit 1
+$ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+grep 'underquoted definition.*FOO' stderr
+grep 'warning.*warning' stderr && Exit 1
+
:
diff --git a/tests/ldadd.test b/tests/ldadd.test
index 005f9d8..7f4fce8 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2010 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
@@ -19,6 +20,8 @@
required=libtool
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -39,5 +42,6 @@ END
: > q.c
$ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 | grep LDADD || Exit 1
+AUTOMAKE_fails
+grep LDADD stderr || Exit 1
Exit 0
diff --git a/tests/mdate.test b/tests/mdate.test
index 704b393..92a736f 100755
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -1,5 +1,6 @@
#!/bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2010 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
@@ -18,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
END
@@ -31,4 +34,5 @@ END
: > texinfo.tex
$ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 > /dev/null | grep 'required file.*mdate-sh'
+AUTOMAKE_fails
+grep 'required file.*mdate-sh' stderr
diff --git a/tests/lex2.test b/tests/oldvars.test
similarity index 69%
copy from tests/lex2.test
copy to tests/oldvars.test
index d588edf..7a2bb71 100755
--- a/tests/lex2.test
+++ b/tests/oldvars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003 Free Software Foundation,
Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,23 +14,24 @@
# 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 Automake suggest using AM_PROG_LEX when a lexer is used.
+# Use of these variables is deprecated:
+# LISP, HEADERS, DATA, SCRIPTS, LTLIBRARIES, LIBRARIES, PROGRAMS, MANS.
. ./defs || Exit 1
set -e
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zot
-zot_SOURCES = joe.l
-END
-
-: > joe.l
+cat >Makefile.am <<\EOF
+DATA =
+HEADERS =
+LIBRARIES =
+LISP =
+LTLIBRARIES =
+MANS =
+PROGRAMS =
+SCRIPTS =
+EOF
$ACLOCAL
AUTOMAKE_fails
-grep AM_PROG_LEX stderr
+test `grep -c anachronism stderr` -eq 8
diff --git a/tests/xsource.test b/tests/tags2.test
similarity index 66%
copy from tests/xsource.test
copy to tests/tags2.test
index df140a5..f6e018c 100755
--- a/tests/xsource.test
+++ b/tests/tags2.test
@@ -1,6 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 2010 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,27 +14,31 @@
# 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 multiple source files with the same object
-# file causes error.
+# TAGS_DEPENDENCIES only make sense if other tag-worthy things (such as
+# sources) exist.
. ./defs || Exit 1
set -e
-cat > Makefile.am << 'END'
-bin_PROGRAMS = zardoz
-zardoz_SOURCES = z.c x/z.c
-END
-
cat >> configure.in << 'END'
AC_PROG_CC
+AC_OUTPUT
END
-mkdir x
-
-: > z.c
-: > x/z.c
+cat >Makefile.am << 'END'
+TAGS_DEPENDENCIES = foo
+END
$ACLOCAL
AUTOMAKE_fails
-$FGREP 'z.$(OBJEXT)' stderr
+grep 'define.*TAGS_DEPENDENCIES.*without' stderr
+
+cat >>Makefile.am << 'END'
+bin_PROGRAMS = bar
+END
+
+AUTOMAKE_run 0
+grep 'define.*TAGS_DEPENDENCIES.*without' stderr && Exit 1
+
+:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-214-g28712ef,
Ralf Wildenhues <=