Tests on extensibility of silent-rules made stricter.

* tests/silent6.test: Made stricter w.r.t. the grepping of the
output produced by `make'.
* tests/silent7.test: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index cefd5bd0e6c50e6e99631a24ce7b7c01182cbca9..b9ce4c921bdd24edd2ee40f753b9ad00703731e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       Make tests on user extensibility of silent-rules mode stricter.
+       * tests/silent6.test: Made stricter w.r.t. the grepping of the
+       output produced by `make'.
+       * tests/silent7.test: Likewise.
+
        Tests on silent-mode for C/Libtool made stricter.
        * tests/silent.test: Made stricter w.r.t. the grepping of the
        output produced by `make'.

diff --git a/tests/silent6.test b/tests/silent6.test
index e6f08dd19d5a9ea9419fcf17b348c0e7850aad4d..2afe6bc798c9d40051840bb34ed23a92036a88fb 100755 (executable)
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  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
@@ -53,7 +53,7 @@ grep 'cp ' stdout && Exit 1
 $MAKE clean
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 
 $MAKE distclean
@@ -61,7 +61,7 @@ $MAKE distclean
 ./configure --disable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 
 $MAKE distclean

diff --git a/tests/silent7.test b/tests/silent7.test
index e9536054a151ee5851414dda6300faedef22fdf9..cd8e1b5d89287a662499ce0c057c35a3732f1ac7 100755 (executable)
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009  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
@@ -46,45 +46,44 @@ $AUTOCONF
 ./configure --disable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 $MAKE clean
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout
 
 $MAKE clean
 $MAKE V=0 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout
+grep 'GEN .*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
-
 $MAKE distclean
 
 ./configure --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout
+grep 'GEN .*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
 $MAKE clean
 $MAKE V=0 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout
+grep 'GEN .*foo' stdout
 grep 'cp ' stdout && Exit 1
 grep 'echo ' stdout && Exit 1
 
 $MAKE clean
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout
-grep 'GEN.*foo' stdout && Exit 1
+grep 'GEN ' stdout && Exit 1
 grep 'cp ' stdout
 grep 'echo ' stdout