* tests/silent4.test: When testing silent builds, don't fail if
make's output simply contains the `mv' substring, but only if
it contains the `mv ' substring (note the trailing space).
* tests/silent5.test: Likewise.
* tests/silent9.test: Likewise.
* tests/silent.test: Likewise, plus updated copyright years.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
From 3d7b25b09b22324806a2ef805cf004cea3ba1b65 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Sun, 25 Apr 2010 22:20:57 +0200
Subject: [PATCH 1/9] Relax silent-rules tests to cater for verbose makes.
* tests/silent4.test: When testing silent builds, don't fail if
make's output simply contains the `mv' substring, but only if
it contains the `mv ' substring (note the trailing space).
* tests/silent5.test: Likewise.
* tests/silent9.test: Likewise.
* tests/silent.test: Likewise, plus updated copyright years.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
---
ChangeLog | 12 ++++++++++++
tests/silent.test | 4 ++--
tests/silent2.test | 4 ++--
tests/silent3.test | 4 ++--
tests/silent4.test | 2 +-
tests/silent5.test | 2 +-
tests/silent9.test | 2 +-
7 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71b0d9b..f19fdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-25 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ Relax tests on silent-rules to cater for overly verbose makes.
+ * tests/silent4.test: When testing silent builds, don't fail if
+ make's output simply contains the `mv' substring, but only if
+ it contains the `mv ' substring (note the trailing space).
+ * tests/silent5.test: Likewise.
+ * tests/silent9.test: Likewise.
+ * tests/silent.test: Likewise, plus updated copyright years.
+ * tests/silent2.test: Likewise.
+ * tests/silent3.test: Likewise.
+
2010-04-25 Ralf Wildenhues <ralf.wildenh...@gmx.de>
Warning and error message formatting cleanups.
diff --git a/tests/silent.test b/tests/silent.test
index 70fcaae..62fd786 100755
--- a/tests/silent.test
+++ b/tests/silent.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
@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep ' -c' stdout && Exit 1
grep ' -o foo' stdout && Exit 1
-grep mv stdout && Exit 1
+grep 'mv ' stdout && Exit 1
grep 'CC .*foo\.' stdout
grep 'CC .*bar\.' stdout
grep 'CC .*baz\.' stdout
diff --git a/tests/silent2.test b/tests/silent2.test
index e0b0935..de66152 100755
--- a/tests/silent2.test
+++ b/tests/silent2.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
@@ -67,7 +67,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep ' -c' stdout && Exit 1
grep ' -o foo' stdout && Exit 1
-grep mv stdout && Exit 1
+grep 'mv ' stdout && Exit 1
grep 'CC .*foo\.' stdout
grep 'CC .*bar\.' stdout
grep 'CC .*baz\.' stdout
diff --git a/tests/silent3.test b/tests/silent3.test
index f83d914..ca783c8 100755
--- a/tests/silent3.test
+++ b/tests/silent3.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
@@ -68,7 +68,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep ' -c' stdout && Exit 1
grep ' -o libfoo' stdout && Exit 1
-grep mv stdout && Exit 1
+grep 'mv ' stdout && Exit 1
grep ' CC .*foo\.' stdout
grep ' CC .*bar\.' stdout
grep ' CC .*baz\.' stdout
diff --git a/tests/silent4.test b/tests/silent4.test
index 3fd9f65..7785709 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -69,7 +69,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep ' -c' stdout && Exit 1
grep ' -o libfoo' stdout && Exit 1
-grep mv stdout && Exit 1
+grep 'mv ' stdout && Exit 1
grep ' CC .*foo\.' stdout
grep ' CC .*bar\.' stdout
grep ' CC .*baz\.' stdout
diff --git a/tests/silent5.test b/tests/silent5.test
index 1f06cf0..dfddb58 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -117,7 +117,7 @@ do
cat stdout
grep ' -c' stdout && Exit 1
grep ' -o ' stdout && Exit 1
- grep mv stdout && Exit 1
+ grep 'mv ' stdout && Exit 1
grep 'CXX .*foo1\.' stdout
grep 'CXX .*baz1\.' stdout
diff --git a/tests/silent9.test b/tests/silent9.test
index 6be0f98..e246354 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -68,7 +68,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
cat stdout
grep ' -c' stdout && Exit 1
grep ' -o libfoo' stdout && Exit 1
-grep mv stdout && Exit 1
+grep 'mv ' stdout && Exit 1
grep ' CC .*foo\.' stdout
grep ' CC .*bar\.' stdout
grep ' CC .*baz\.' stdout
--
1.6.5
