From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 27 Apr 2010 00:10:21 +0000 (+0200)
Subject: Relax silent-rules tests to cater to verbose makes.
X-Git-Tag: v1.11.1b~82^2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9afaf90073a554148e834b72fa40ade59029740b;p=thirdparty%2Fautomake.git

Relax silent-rules tests to cater to verbose makes.

* tests/silent.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/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent9.test: Likewise.

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

diff --git a/ChangeLog b/ChangeLog
index da01f8f49..59ff6942c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	Relax tests on silent-rules to cater to overly verbose makes.
+	* tests/silent.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/silent2.test: Likewise.
+	* tests/silent3.test: Likewise.
+	* tests/silent4.test: Likewise.
+	* tests/silent5.test: Likewise.
+	* tests/silent9.test: Likewise.
+
 2010-01-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix silent-rules output for disabled dependency tracking.
diff --git a/tests/silent.test b/tests/silent.test
index 70fcaaefb..62fd786e5 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 e0b093522..de6615247 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 70023ecb4..4436f5511 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 3fd9f65d8..778570961 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 1f06cf0e3..dfddb58a1 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 6be0f98d0..e24635480 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