[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-673-g9dffb4d

[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=9dffb4d697a1559646adfaf3b3f51596dcf96359

The branch, master has been updated
       via  9dffb4d697a1559646adfaf3b3f51596dcf96359 (commit)
       via  06b839e41b255cee3fdc9eba01d94db888c37181 (commit)
      from  a5e77cacea50a8ff2b9f2805f466d51c2813b449 (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 -----------------------------------------------------------------
commit 9dffb4d697a1559646adfaf3b3f51596dcf96359
Merge: a5e77ca 06b839e
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Jan 21 19:56:50 2011 +0100

    Merge branch 'cygnus-test-fixes'
    
    * cygnus-test-fixes:
      tests: avoid false failure in cygnus-dependency-tracking.test.

commit 06b839e41b255cee3fdc9eba01d94db888c37181
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Jan 21 19:54:35 2011 +0100

    tests: avoid false failure in cygnus-dependency-tracking.test.
    
    * tests/cygnus-dependency-tracking.test: Be less restrictive
    when grepping the compiler error message, GCC 3.4.6 on FreeBSD
    does not mention an undefined symbol.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                             |    7 +++++++
 tests/cygnus-dependency-tracking.test |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3611e0..dc65f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-21  Ralf Wildenhues  <address@hidden>
+
+       tests: avoid false failure in cygnus-dependency-tracking.test.
+       * tests/cygnus-dependency-tracking.test: Be less restrictive
+       when grepping the compiler error message, GCC 3.4.6 on FreeBSD
+       does not mention an undefined symbol.
+
 2011-01-20  Ralf Wildenhues  <address@hidden>
 
        tests: revert not turning off errexit in instspc-test.sh
diff --git a/tests/cygnus-dependency-tracking.test 
b/tests/cygnus-dependency-tracking.test
index 5f0051e..1bfec25 100755
--- a/tests/cygnus-dependency-tracking.test
+++ b/tests/cygnus-dependency-tracking.test
@@ -66,6 +66,7 @@ $MAKE test-nodeps
 $MAKE clean
 $MAKE >out 2>&1 && { cat out; Exit 1; }
 cat out
-$FGREP 'GIVE_BACK' out
+# Not all compilers mention the undefined symbol in the error message.
+grep GIVE_BACK out || grep main out
 
 :


hooks/post-receive
-- 
GNU Automake