From 6328f148f51cf748a07981915adb6e4b06c6f7c9 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 14 Jul 2010 13:33:49 +0200
Subject: [PATCH] Separate failing part of test `all.test'.

* tests/all.test: Keep only (x)failing part of the test.  Working
checks moved out to ...
* tests/all2.test: ... this new test.
* tests/Makefile.am (TESTS): Updated.
---
 ChangeLog         |  6 ++++++
 tests/Makefile.am |  1 +
 tests/Makefile.in |  1 +
 tests/all.test    | 25 +++++++++----------------
 tests/all2.test   | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 16 deletions(-)
 create mode 100755 tests/all2.test

diff --git a/ChangeLog b/ChangeLog
index 56f62b4..6c59e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	Separate failing part of test `all.test'.
+	* tests/all.test: Keep only (x)failing part of the test.  Working
+	checks moved out to ...
+	* tests/all2.test: ... this new test.
+	* tests/Makefile.am (TESTS): Updated.
+
 	Modernize, improve and extend tests `subobj*.test'.
 	* tests/subobjname.test:  Add trailing `:' command.
 	* tests/subobj.test: Make grepping of `Makefile.in' stricter.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b27417b..7338399 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -69,6 +69,7 @@ acsilent.test \
 acsubst.test \
 acsubst2.test \
 all.test \
+all2.test \
 alloca.test \
 alloca2.test \
 alpha.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9714154..1ed28c8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -307,6 +307,7 @@ acsilent.test \
 acsubst.test \
 acsubst2.test \
 all.test \
+all2.test \
 alloca.test \
 alloca2.test \
 alpha.test \
diff --git a/tests/all.test b/tests/all.test
index 3d761f4..791d081 100755
--- a/tests/all.test
+++ b/tests/all.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2007, 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,30 +15,22 @@
 # 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 all-local and other -local targets work correctly.
+# Test to make sure several *-local's in a single rule work.
 
 . ./defs || Exit 1
+
 set -e
 
 targets='all install-exec install-data uninstall'
-for target in $targets; do
-   echo "Doing $target"
-   echo "${target}-local:" > Makefile.am
-
-   $ACLOCAL
-   $AUTOMAKE
-
-   $FGREP "${target}-local ${target}-local" Makefile.in && Exit 1
-done
-
-# Several *-local's in a single rule.
-echo "Doing $targets"
 echo "$targets:" | sed -e 's/[ :]/-local&/g' > Makefile.am
+cat Makefile.am  # might be useful for debugging
+
 $ACLOCAL
 $AUTOMAKE
 
 for target in $targets; do
-  $EGREP "${target}-am:.*${target}-local" Makefile.in
+  grep "${target}-local" Makefile.in  # might be useful for debugging
+  grep "${target}-am:.*${target}-local" Makefile.in
 done
 
-Exit 0
+:
diff --git a/tests/all2.test b/tests/all2.test
new file mode 100755
index 0000000..38b6f8c
--- /dev/null
+++ b/tests/all2.test
@@ -0,0 +1,34 @@
+#! /bin/sh
+# 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
+# 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 all-local and other -local targets work correctly.
+
+. ./defs || Exit 1
+
+set -e
+
+$ACLOCAL
+
+targets='all install-exec install-data uninstall'
+for target in $targets; do
+  : Doing $target
+  echo "${target}-local:" > Makefile.am
+  $AUTOMAKE
+  grep "${target}-local ${target}-local" Makefile.in && Exit 1
+  grep "${target}-am:.*${target}-local" Makefile.in
+done
+
+:
-- 
2.7.4