From b025bb83eb4442290442c5b070e0f53c0445ea2a Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 26 Oct 2012 14:13:25 +0200
Subject: [PATCH] tests: merge two tests on automatic remake functionality

* t/remake2.sh: Merge ...
* t/remake-subdir-grepping.sh: ... in here.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 t/list-of-tests.mk          |  1 -
 t/remake-subdir-grepping.sh |  1 +
 t/remake2.sh                | 38 --------------------------------------
 3 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100755 t/remake2.sh

diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index cbe7dc152..722ccda88 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -903,7 +903,6 @@ t/python-pr10995.sh \
 t/recurs.sh \
 t/recurs2.sh \
 t/relativize.tap \
-t/remake2.sh \
 t/remake3.sh \
 t/remake3a.sh \
 t/remake4.sh \
diff --git a/t/remake-subdir-grepping.sh b/t/remake-subdir-grepping.sh
index a8afc402e..0cce72e05 100755
--- a/t/remake-subdir-grepping.sh
+++ b/t/remake-subdir-grepping.sh
@@ -34,5 +34,6 @@ $ACLOCAL
 $AUTOMAKE
 
 grep '^Makefile' sub/Makefile.in
+grep '\$(AUTOMAKE).* sub/Makefile' sub/Makefile.in
 
 :
diff --git a/t/remake2.sh b/t/remake2.sh
deleted file mode 100755
index ff88d780a..000000000
--- a/t/remake2.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-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/>.
-
-# Weak "grepping" test trying to ensure that remaking rules in subdir
-# are correct even when there is no upper-level Makefile.
-# TODO: we should really add also functional tests for this!
-
-. ./defs || exit 1
-
-cat > configure.ac <<END
-AC_INIT([$me], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([sub/Makefile])
-AC_OUTPUT
-END
-
-mkdir sub
-: > sub/Makefile.am
-
-$ACLOCAL
-$AUTOMAKE
-
-grep '\$(AUTOMAKE).*sub/Makefile' sub/Makefile.in
-
-:
-- 
2.11.4.GIT