[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-791-g6b22def

[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=6b22deff997b02052f4315777ca4ab4b64b8d8fe

The branch, master has been updated
       via  6b22deff997b02052f4315777ca4ab4b64b8d8fe (commit)
       via  e9bb4e913957b0388182de7350e198d6fe74bf02 (commit)
       via  214bafdb4f7b97e8897cf8668867a2bbcfc804b2 (commit)
      from  3b0c8d59b79346861dd48242672b7aed7f863c9f (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 6b22deff997b02052f4315777ca4ab4b64b8d8fe
Merge: 3b0c8d5 e9bb4e9
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 23 11:22:40 2011 +0200

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog                   |   13 +++++++++++++
 tests/Makefile.am           |    1 -
 tests/Makefile.in           |    1 -
 tests/maintclean-vpath.test |    2 +-
 tests/mclean.test           |   34 ----------------------------------
 5 files changed, 14 insertions(+), 37 deletions(-)
 delete mode 100755 tests/mclean.test

diff --git a/ChangeLog b/ChangeLog
index 8821b0a..39e4f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       tests: fix typo (copy & paste blunder) in heading comment
+       * tests/maintclean-vpath.test: Correctly refer to the sister test
+       as `maintclean.test', not as `maintclean-vpath.test'.
+
+2011-04-23  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant test `mclean.test'
+       * tests/mclean.test: Remove, it's a weak grepping test completely
+       superseded by the much more complete `maintclean.test'.
+       * tests/Makefile.am (TESTS): Update.
+
 2011-04-22  Stefano Lattarini  <address@hidden>
 
        testsuite: more environment sanitization
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f748ef5..28058d9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -633,7 +633,6 @@ man2.test \
 man3.test \
 man4.test \
 man5.test \
-mclean.test \
 mdate.test \
 mdate2.test \
 mdate3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 859eed6..5342b96 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -898,7 +898,6 @@ man2.test \
 man3.test \
 man4.test \
 man5.test \
-mclean.test \
 mdate.test \
 mdate2.test \
 mdate3.test \
diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test
index 00c6d3f..5b5420c 100755
--- a/tests/maintclean-vpath.test
+++ b/tests/maintclean-vpath.test
@@ -15,7 +15,7 @@
 # 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'
+# This test is for VPATH builds; see sister test `maintclean.test'
 # for in-tree builds.
 
 . ./defs || Exit 1
diff --git a/tests/mclean.test b/tests/mclean.test
deleted file mode 100755
index 07ae0fe..0000000
--- a/tests/mclean.test
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 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 MAINTAINERCLEANFILES works.
-# Report from Paul D. Smith.
-
-. ./defs || Exit 1
-
-cat > Makefile.am << 'END'
-MAINTAINERCLEANFILES = foo
-END
-
-: > FOO
-
-$ACLOCAL
-$AUTOMAKE
-
-grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in
-
-:


hooks/post-receive
-- 
GNU Automake