[Automake-commit] [SCM] GNU Automake branch, je-silent, updated. v1.11-53-g9afaf90

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9afaf90073a554148e834b72fa40ade59029740b

The branch, je-silent has been updated
       via  9afaf90073a554148e834b72fa40ade59029740b (commit)
      from  c150e6c8cd926c408d2e6003b9acb659c978fdaa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 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 da01f8f..59ff694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-06  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        Fix silent-rules output for disabled dependency tracking.
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 70023ec..4436f55 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


hooks/post-receive
-- 
GNU Automake