[PATCH 5/5] Improved test silent5.test.

[Stefano Lattarini]

Finally, a "cleanup" patch for `silent5.test'.

* tests/silent5.test: Removed by hand all generated C files after
non-verbose builds, to ensure the following builds are clean.
A couple of greps of make's output have been made stricter.
Extended test description telling it's fine if it overlaps a bit
with other `silent*.test' tests.

From 67d51f255ca50ffeff000308f33359d12568b675 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Thu, 22 Apr 2010 21:08:10 +0200
Subject: [PATCH 5/5] Improved test silent5.test.

* tests/silent5.test: Removed by hand all generated C files after
non-verbose builds, to ensure the following builds are clean.
A couple of greps of make's output have been made stricter.
Extended test description telling it's fine if it overlaps a bit
with other `silent*.test' tests.
---
 ChangeLog          |    7 +++++++
 tests/silent5.test |   16 +++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a0eacf9..6cd6f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-04-22  Stefano Lattarini  <address@hidden>
 
+       Improved test silent5.test.
+       * tests/silent5.test: Removed by hand all generated C files after
+       non-verbose builds, to ensure the following builds are clean.
+       A couple of greps of make's output have been made stricter.
+       Extended test description telling it's fine if it overlaps a bit
+       with other `silent*.test' tests.
+
        New tests for Automake silent-mode with Fortran.
        * tests/silentf77.test: New test.
        * tests/silentf90.test: Likewise.
diff --git a/tests/silent5.test b/tests/silent5.test
index 1f06cf0..9291acb 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
@@ -15,6 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode, languages other than C.
+# This test partly overlaps with other silent*.test, but it serves as
+# a stress test by using many different languages at once -- so don't
+# remove this test script.
 
 required='g++ gfortran flex bison'
 . ./defs
@@ -116,7 +119,7 @@ do
   $MAKE >stdout || { cat stdout; Exit 1; }
   cat stdout
   grep ' -c' stdout && Exit 1
-  grep ' -o ' stdout && Exit 1
+  grep ' -o' stdout && Exit 1
   grep mv stdout && Exit 1
 
   grep 'CXX .*foo1\.' stdout
@@ -139,10 +142,13 @@ do
   grep 'CXXLD .*baz' stdout
   grep 'CCLD .*bla' stdout
 
+  # Ensure a clean rebuild.
   $MAKE clean
+  rm -f foo5.c foo6.[ch] sub/baz5.c sub/baz6.[ch]
+
   $MAKE V=1 >stdout || { cat stdout; Exit 1; }
   cat stdout
-  grep ' -c' stdout
+  grep ' -c ' stdout
   grep ' -o ' stdout
 
   grep 'CXX .*foo1\.' stdout && Exit 1
@@ -164,8 +170,12 @@ do
   grep 'CCLD .*bar' stdout && Exit 1
   grep 'CXXLD .*baz' stdout && Exit 1
   grep 'CCLD .*bla' stdout && Exit 1
+
+  # Ensure a clean reconfiguration/rebuild.
   $MAKE clean
   $MAKE maintainer-clean
+  rm -f foo5.c foo6.[ch] sub/baz5.c sub/baz6.[ch]
+
 done
 
 :
-- 
1.6.5