[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.1-29-g9cb6dc8

[Stefano Lattarini]

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=9cb6dc889b95c90f443e7ec30b3541d33ca97ef3

The branch, maint has been updated
       via  9cb6dc889b95c90f443e7ec30b3541d33ca97ef3 (commit)
       via  911a6e9fc85ce67a867178bd7daf8ce8c461135c (commit)
      from  b72e9747b2493362fc43030c500d3f4e881a2c06 (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 9cb6dc889b95c90f443e7ec30b3541d33ca97ef3
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 14 23:27:42 2012 +0200

    tests: minor reorganization of few tests
    
    * t/subdir3.sh: Rename ...
    * t/sourcefile-in-subdir.sh: ... like this.
    * t/subdir4.sh: Rename ...
    * t/depcomp-implicit-auxdir.sh: ... like this.
    * t/subdir6.sh: Rename ...
    * t/confh-subdir-clean.sh: ... like this.
    * t/subdir7.sh: Renamed ...
    * t/dir-named-obj-is-bad.sh: ... like this, and enhance.
    * t/srcsub.sh, t/srcsub2.sh: Unify ...
    * t/src-acsubst.sh: ... as this test.
    * t/list-of-tests.mk: Adjust.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 911a6e9fc85ce67a867178bd7daf8ce8c461135c
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 14 23:04:33 2012 +0200

    fixup: adjust t/list-of-tests.mk for renamed/added tests
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 t/{subdir6.sh => confh-subdir-clean.sh}      |    0
 t/{subdir4.sh => depcomp-implicit-auxdir.sh} |    0
 t/{subdir7.sh => dir-named-obj-is-bad.sh}    |   22 +++++++++++++--
 t/list-of-tests.mk                           |   28 ++++++++++----------
 t/{subdir3.sh => sourcefile-in-subdir.sh}    |    0
 t/{srcsub.sh => src-acsubst.sh}              |   25 +++++++++++++-----
 t/srcsub2.sh                                 |   36 --------------------------
 7 files changed, 51 insertions(+), 60 deletions(-)
 rename t/{subdir6.sh => confh-subdir-clean.sh} (100%)
 rename t/{subdir4.sh => depcomp-implicit-auxdir.sh} (100%)
 rename t/{subdir7.sh => dir-named-obj-is-bad.sh} (71%)
 rename t/{subdir3.sh => sourcefile-in-subdir.sh} (100%)
 rename t/{srcsub.sh => src-acsubst.sh} (58%)
 delete mode 100755 t/srcsub2.sh

diff --git a/t/subdir6.sh b/t/confh-subdir-clean.sh
similarity index 100%
rename from t/subdir6.sh
rename to t/confh-subdir-clean.sh
diff --git a/t/subdir4.sh b/t/depcomp-implicit-auxdir.sh
similarity index 100%
rename from t/subdir4.sh
rename to t/depcomp-implicit-auxdir.sh
diff --git a/t/subdir7.sh b/t/dir-named-obj-is-bad.sh
similarity index 71%
rename from t/subdir7.sh
rename to t/dir-named-obj-is-bad.sh
index a2c47a1..e422f19 100755
--- a/t/subdir7.sh
+++ b/t/dir-named-obj-is-bad.sh
@@ -26,12 +26,12 @@ AC_OUTPUT
 END
 
 : > obj/Makefile.am
-echo 'SUBDIRS = obj' >Makefile.am
+echo 'SUBDIRS = obj' > Makefile.am
 
 $ACLOCAL
 
 AUTOMAKE_fails
-grep 'Makefile.am:1:.*obj.*BSD' stderr
+grep "^Makefile\.am:1:.*'obj'.*BSD make" stderr
 
 cat >Makefile.am <<'END'
 SUBDIRS = @STH@
@@ -40,6 +40,22 @@ DIST_SUBDIRS = $(FOO)
 END
 
 AUTOMAKE_fails
-grep 'Makefile.am:2:.*obj.*BSD' stderr
+grep "^Makefile\\.am:2:.*'obj'.*BSD make" stderr
+
+rm -rf autom4te*.cache
+
+cat >configure.ac << 'END'
+AC_INIT([x], [1.0])
+AC_CONFIG_AUX_DIR([obj])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+END
+
+rm -f obj/Makefile.am
+: > Makefile.am
+
+$ACLOCAL
+AUTOMAKE_fails -a
+grep "^configure\.ac:2:.*'obj'.*BSD make" stderr
 
 :
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 93b50c6..c73afda 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -255,7 +255,6 @@ t/compile_f90_c_cxx.sh \
 t/compile_f_c_cxx.sh \
 t/cond-basic.sh \
 t/cond.sh \
-t/cond2.sh \
 t/cond3.sh \
 t/cond4.sh \
 t/cond5.sh \
@@ -317,6 +316,7 @@ t/confh5.sh \
 t/confh6.sh \
 t/confh7.sh \
 t/confh8.sh \
+t/confh-subdir-clean.sh \
 t/confincl.sh \
 t/conflnk.sh \
 t/conflnk2.sh \
@@ -369,6 +369,7 @@ t/depcomp.sh \
 t/depcomp2.sh \
 t/depcomp8a.sh \
 t/depcomp8b.sh \
+t/depcomp-implicit-auxdir.sh \
 t/depdist.sh \
 t/depend.sh \
 t/depend3.sh \
@@ -377,6 +378,7 @@ t/depend5.sh \
 t/depend6.sh \
 t/deprecated-acinit.sh \
 t/destdir.sh \
+t/dir-named-obj-is-bad.sh \
 t/dirlist.sh \
 t/dirlist2.sh \
 t/dirlist-abspath.sh \
@@ -990,8 +992,8 @@ t/silent-nested-vars.sh \
 t/silent-lex.sh \
 t/silent-yacc.sh \
 t/silent-yacc-headers.sh \
-t/srcsub.sh \
-t/srcsub2.sh \
+t/src-acsubst.sh \
+t/sourcefile-in-subdir.sh \
 t/space.sh \
 t/specflg.sh \
 t/specflg2.sh \
@@ -1018,20 +1020,18 @@ t/strip.sh \
 t/strip2.sh \
 t/strip3.sh \
 t/subdir.sh \
-t/subdir2.sh \
-t/subdir3.sh \
-t/subdir4.sh \
-t/subdir5.sh \
-t/subdir6.sh \
-t/subdir7.sh \
-t/subdir8.sh \
-t/subdir9.sh \
+t/subdir-ac-subst.sh \
+t/subdir-add-pr46.sh \
+t/subdir-add2-pr46.sh \
+t/subdir-am-cond.sh \
+t/subdir-cond-err.sh \
+t/subdir-cond-gettext.sh \
+t/subdir-order.sh \
+t/subdir-with-slash.sh \
+t/subdir-subsub.sh \
 t/subdir10.sh \
 t/subdir-distclean.sh \
 t/subdirbuiltsources.sh \
-t/subcond.sh \
-t/subcond2.sh \
-t/subcond3.sh \
 t/subobj.sh \
 t/subobj2.sh \
 t/subobj4.sh \
diff --git a/t/subdir3.sh b/t/sourcefile-in-subdir.sh
similarity index 100%
rename from t/subdir3.sh
rename to t/sourcefile-in-subdir.sh
diff --git a/t/srcsub.sh b/t/src-acsubst.sh
similarity index 58%
rename from t/srcsub.sh
rename to t/src-acsubst.sh
index 978a105..97d536c 100755
--- a/t/srcsub.sh
+++ b/t/src-acsubst.sh
@@ -14,20 +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 config sub in _SOURCES fails.
+# Test to make sure config substitution in _SOURCES fails.
 
 . ./defs || Exit 1
 
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
+echo AC_PROG_CC >> configure.ac
 
 cat > Makefile.am << 'END'
-bin_PROGRAMS = x
+bin_PROGRAMS = x y
 x_SOURCES = x.c @FOO@
-EXTRA_x_SOURCES = y.c
+bar = @FOO@
+foo = $(bar)
+EXTRA_y_SOURCES = $(foo) y.c
 END
 
 $ACLOCAL
 AUTOMAKE_fails
-grep 'Makefile.am:2:.*x_SOURCES.*substitution' stderr
+
+cat > exp-err << 'END'
+Makefile.am:2: error: 'x_SOURCES' includes configure substitution '@FOO@';
+Makefile.am:2: configure substitutions are not allowed in _SOURCES variables
+Makefile.am:3: error: 'bar' includes configure substitution '@FOO@'
+Makefile.am:3: and is referred to from 'EXTRA_y_SOURCES';
+Makefile.am:3: configure substitutions are not allowed in _SOURCES variables
+END
+
+diff exp-err stderr
+
+:
diff --git a/t/srcsub2.sh b/t/srcsub2.sh
deleted file mode 100755
index 2d6da97..0000000
--- a/t/srcsub2.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2001-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
-# 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/>.
-
-# Test to make sure config sub in _SOURCES fails.
-
-. ./defs || Exit 1
-
-cat >> configure.ac << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = x
-bar = @FOO@
-foo = $(bar)
-x_SOURCES = x.c $(foo)
-EXTRA_x_SOURCES = y.c
-END
-
-$ACLOCAL
-AUTOMAKE_fails
-grep 'Makefile.am:2:.*bar.*substitution' stderr
-grep 'Makefile.am:2:.*x_SOURCES' stderr


hooks/post-receive
-- 
GNU Automake