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 da01f8f4971e7a9ecbdcc605c869ff2a45f17677..59ff6942c9b930c480e69bc6393958e68457f4d8 100644 (file)
--- 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 70fcaaefbc1d2d9722d01ac3f5ec5aeb7f585a0c..62fd786e57ac22efa34cbab9c653b6b2d0c92f98 100755 (executable)
--- 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 e0b0935223c4b15ec9dde2b45d6ef10d7ae35ce0..de6615247b1356204ba28e06ae21939472f70b2a 100755 (executable)
--- 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 70023ecb46c0d50323a2eb101b9e555f7b55034e..4436f55114c06bfb28f3bde49feda6e90ddb8523 100755 (executable)
--- 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 3fd9f65d869c0d436ba76b6a6b0691238e9a934e..778570961c56b5873ecae6a5c7e2e193d7a9143f 100755 (executable)
--- 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 1f06cf0e3eed03a28e4b50befcdfba8e1ee746bb..dfddb58a1737a94c16db556d8232935b1adc6a6b 100755 (executable)
--- 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 6be0f98d048c9eccb1b8b8d9ed5a6f3411bcb080..e246354802c3b8496350bf6cca440785048037f6 100755 (executable)
--- 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