Patch updated (with a tiny improvement w.r.t. stricter make output
grepping)
From 84e67683c982c7fe2a0e05880edc0612953af7ce Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Tue, 27 Apr 2010 02:06:05 +0200
Subject: [PATCH 8/9] 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.
---
ChangeLog | 5 +++++
tests/silent6.test | 6 +++---
tests/silent7.test | 15 +++++++--------
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 12261ea..8a00981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-04-27 Stefano Lattarini <stefano.lattar...@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 e6f08dd..2afe6bc 100755
--- 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 e953605..cd8e1b5 100755
--- 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
--
1.6.5
