[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-324-g1dd55a4

[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=1dd55a48e354e57686879ea9900c8daf0402a10a

The branch, maint has been updated
       via  1dd55a48e354e57686879ea9900c8daf0402a10a (commit)
      from  34c1c2d884774ae91f82e1c5027d1502b3112c6a (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 1dd55a48e354e57686879ea9900c8daf0402a10a
Author: Stefano Lattarini <address@hidden>
Date:   Wed Mar 30 12:48:42 2011 +0200

    tests: improve tests on "maintainer-clean" target
    
    * tests/aclocal6.test: Move checks related to "maintainer-clean"
    functionalities into ...
    * tests/maintclean-vpath.test: ... this new test.
    * tests/maintclean.test: Update heading comments.  Extend to also
    test subdirs.  Remove useless disabling of YACC.  Fix m4 quoting
    in configure.in.  Add a trailing `:' command.
    * tests/Makefile.am (TESTS): Update.

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

Summary of changes:
 ChangeLog                                        |   12 +++++
 tests/Makefile.am                                |    1 +
 tests/Makefile.in                                |    1 +
 tests/aclocal6.test                              |   20 +--------
 tests/{maintclean.test => maintclean-vpath.test} |   50 +++++++++++++++++----
 tests/maintclean.test                            |   36 +++++++++++++---
 6 files changed, 84 insertions(+), 36 deletions(-)
 copy tests/{maintclean.test => maintclean-vpath.test} (64%)

diff --git a/ChangeLog b/ChangeLog
index dae2a48..0c2d416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-30  Stefano Lattarini  <address@hidden>
+
+       tests: improve tests on "maintainer-clean" target
+       * tests/aclocal6.test: Move checks related to "maintainer-clean"
+       functionalities into ...
+       * tests/maintclean-vpath.test: ... this new test.
+       * tests/maintclean.test: Update heading comments.  Extend to also
+       test subdirs.  Remove useless disabling of YACC.  Fix m4 quoting
+       in configure.in.  Add a trailing `:' command.  Remove extra blank
+       lines.
+       * tests/Makefile.am (TESTS): Update.
+
 2011-03-21  Ralf Wildenhues  <address@hidden>
 
        tests: fix unindent to use printf not echo for script.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4becdbb..bfa8edf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -489,6 +489,7 @@ ltorder.test \
 lzma.test \
 m4-inclusion.test \
 maintclean.test \
+maintclean-vpath.test \
 make.test \
 makej.test \
 makej2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b9b1f6e..ed89d07 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -759,6 +759,7 @@ ltorder.test \
 lzma.test \
 m4-inclusion.test \
 maintclean.test \
+maintclean-vpath.test \
 make.test \
 makej.test \
 makej2.test \
diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index ea6bac3..220bf90 100755
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 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
@@ -44,13 +44,6 @@ $ACLOCAL -I m4
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
 
-# Users can disable autom4te.cache.
-if test -d autom4te.cache; then
-  test_cache='test -d'
-else
-  test_cache=:
-fi
-
 mkdir build
 cd build
 
@@ -79,15 +72,4 @@ test -f $me-1.0/m4/moredefs.m4
 test -f $me-1.0/m4/somedefs.m4
 test -f $me-1.0/acinclude.m4
 
-# Make sure maintainer-clean works in VPATH builds.
-# (This is unrelated to the rest of this test.)
-$MAKE clean
-$test_cache ../autom4te.cache
-test -f Makefile
-test -f sub/Makefile
-$MAKE maintainer-clean
-test ! -d ../autom4te.cache
-test ! -f Makefile
-test ! -f sub/Makefile
-
 :
diff --git a/tests/maintclean.test b/tests/maintclean-vpath.test
similarity index 64%
copy from tests/maintclean.test
copy to tests/maintclean-vpath.test
index a66464b..8dd2a95 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean-vpath.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# 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
@@ -15,27 +15,36 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure distclean and maintainer-clean erase the right files.
+# This test is for VPATH builds; see sister test `maintclean-vpath.test'
+# for in-tree builds.
 
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CONFIG_FILES(bar)
+AC_CONFIG_FILES([bar sub/Makefile])
 AC_OUTPUT
 END
 
 cat > Makefile.am <<'END'
+SUBDIRS = sub
 noinst_DATA = foo.c
-
 foo.c:
        touch foo.c
-
 MAINTAINERCLEANFILES = foo.c
+END
 
+mkdir sub
+cat > sub/Makefile.am <<'END'
+noinst_SCRIPTS = zap
+zap: zap.sh
+       cp $(srcdir)/zap.sh $@ && chmod a+x $@
+MAINTAINERCLEANFILES = zap
 END
 
-touch bar.in
+: > bar.in
+: > sub/zap.sh
 
 $ACLOCAL
 $AUTOCONF
@@ -43,34 +52,55 @@ $AUTOMAKE
 
 # Users can disable autom4te.cache.
 if test -d autom4te.cache; then
-  test_cache='test -d autom4te.cache'
+  test_cache='test -d ../autom4te.cache'
 else
   test_cache=:
 fi
 
-# Since we don't require Yacc, make sure it's not used.
-./configure YACC=false
+mkdir build
+
+chmod a-w . sub
+
+cd build
+
+../configure
 test -f bar
 
 $MAKE
 test -f foo.c
+test -f sub/zap
+$test_cache
 
 $MAKE distclean
 test ! -f bar
 test ! -f Makefile
+test ! -f sub/Makefile
 test ! -f config.status
 test -f foo.c
+test -f sub/zap
+test -f ../sub/zap.sh
 $test_cache
 
-./configure
+../configure
 test -f bar
 
 $MAKE foo.c
 test -f foo.c
+cd sub
+$MAKE zap
+test -f zap
+cd ..
+
+chmod u+w ..
 
 $MAKE maintainer-clean
+test -f ../sub/zap.sh
 test ! -f bar
 test ! -f foo.c
+test ! -f sub/zap
 test ! -f Makefile
+test ! -f sub/Makefile
 test ! -f config.status
-test ! -d autom4te.cache
+test ! -d ../autom4te.cache
+
+:
diff --git a/tests/maintclean.test b/tests/maintclean.test
index a66464b..9e22463 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 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
@@ -15,27 +15,36 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure distclean and maintainer-clean erase the right files.
+# This test is for in-tree builds; see sister test `maintclean-vpath.test'
+# for VPATH builds.
 
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CONFIG_FILES(bar)
+AC_CONFIG_FILES([bar sub/Makefile])
 AC_OUTPUT
 END
 
 cat > Makefile.am <<'END'
+SUBDIRS = sub
 noinst_DATA = foo.c
-
 foo.c:
        touch foo.c
-
 MAINTAINERCLEANFILES = foo.c
+END
 
+mkdir sub
+cat > sub/Makefile.am <<'END'
+noinst_SCRIPTS = zap
+zap: zap.sh
+       cp $(srcdir)/zap.sh $@ && chmod a+x $@
+MAINTAINERCLEANFILES = zap
 END
 
-touch bar.in
+: > bar.in
+: > sub/zap.sh
 
 $ACLOCAL
 $AUTOCONF
@@ -48,18 +57,22 @@ else
   test_cache=:
 fi
 
-# Since we don't require Yacc, make sure it's not used.
-./configure YACC=false
+./configure
 test -f bar
 
 $MAKE
 test -f foo.c
+test -f sub/zap
+$test_cache
 
 $MAKE distclean
 test ! -f bar
 test ! -f Makefile
+test ! -f sub/Makefile
 test ! -f config.status
 test -f foo.c
+test -f sub/zap
+test -f sub/zap.sh
 $test_cache
 
 ./configure
@@ -67,10 +80,19 @@ test -f bar
 
 $MAKE foo.c
 test -f foo.c
+cd sub
+$MAKE zap
+test -f zap
+cd ..
 
 $MAKE maintainer-clean
+test -f sub/zap.sh
 test ! -f bar
 test ! -f foo.c
+test ! -f sub/zap
 test ! -f Makefile
+test ! -f sub/Makefile
 test ! -f config.status
 test ! -d autom4te.cache
+
+:


hooks/post-receive
-- 
GNU Automake