[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-462-g1c914a5

[Stefano Lattarini]

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=1c914a574432d1f86f4f9c80c6c6c112955841ac

The branch, master has been updated
       via  1c914a574432d1f86f4f9c80c6c6c112955841ac (commit)
       via  36c1b5c0f0d5e9a9a3c91233fcb0e408ef6093e3 (commit)
       via  87b99db562a6353251cd08442ecce8ca262ba807 (commit)
       via  d0d9f70fffcb66757451b8b53e00ae6cffa92b30 (commit)
       via  98462e64b04b0ecd1015961bc3a63caf23f3bb41 (commit)
      from  18da293eff7612161d2ae31fddb304d208d2904e (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 1c914a574432d1f86f4f9c80c6c6c112955841ac
Merge: 18da293 36c1b5c
Author: Stefano Lattarini <address@hidden>
Date:   Wed Nov 17 20:23:13 2010 +0100

    Merge branch 'maint'

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

Summary of changes:
 ChangeLog            |   16 ++++++++++++++++
 tests/silent5.test   |    4 ++++
 tests/silentf77.test |    6 ++++++
 tests/silentf90.test |    6 ++++++
 4 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40d770e..a78cdd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-17  Stefano Lattarini  <address@hidden>
+
+       Fix spurious failures of silent-rules tests with Sun Fortran.
+       * tests/silentf77.test: Strip from the make output some verbose
+       messages possibly printed by the SunStudio fortran compilers, to
+       avoid spurious failures.  Add a trailing `:' command.
+       * tests/silentf90.test: Likewise.
+
+2010-11-17  Stefano Lattarini  <address@hidden>
+
+       Fix spurious failures of silent5.test with Sun Fortran.
+       * tests/silent5.test: Strip from the make output some verbose
+       messages possibly printed by the SunStudio fortran compilers,
+       to avoid spurious failures.  This bug has been there from the
+       very first version of this test script.
+
 2010-11-16  Stefano Lattarini  <address@hidden>
 
        Fix regression in colon{5,6}.test (failures on AIX 5.3).
diff --git a/tests/silent5.test b/tests/silent5.test
index e29f48f..79dfca2 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -35,6 +35,10 @@ do_and_check_silent_build ()
 
   $MAKE >stdout || { cat stdout; Exit 1; }
   cat stdout
+  # Avoid spurious failures with SunStudio Fortran compilers.
+  sed '/^NOTICE:/d' stdout > t
+  mv -f t stdout
+  cat stdout
 
   $EGREP ' (-c|-o)' stdout && Exit 1
   $EGREP '(mv|ylwrap) ' stdout && Exit 1
diff --git a/tests/silentf77.test b/tests/silentf77.test
index 39495d4..54a15a1 100755
--- a/tests/silentf77.test
+++ b/tests/silentf77.test
@@ -63,6 +63,10 @@ $AUTOCONF
 ./configure --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
+# Avoid spurious failures with SunStudio Fortran compilers.
+sed '/^NOTICE:/d' stdout > t
+mv -f t stdout
+cat stdout
 
 $EGREP ' (-c|-o)' stdout && Exit 1
 grep 'mv ' stdout && Exit 1
@@ -89,3 +93,5 @@ $EGREP '(F77|FC|LD) ' stdout && Exit 1
 
 $MAKE clean
 $MAKE maintainer-clean
+
+:
diff --git a/tests/silentf90.test b/tests/silentf90.test
index 9330bdd..6435fb4 100755
--- a/tests/silentf90.test
+++ b/tests/silentf90.test
@@ -63,6 +63,10 @@ $AUTOCONF
 ./configure --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
+# Avoid spurious failures with SunStudio Fortran compilers.
+sed '/^NOTICE:/d' stdout > t
+mv -f t stdout
+cat stdout
 
 $EGREP ' (-c|-o)' stdout && Exit 1
 grep 'mv ' stdout && Exit 1
@@ -89,3 +93,5 @@ $EGREP '(F77|FC|LD) ' stdout && Exit 1
 
 $MAKE clean
 $MAKE maintainer-clean
+
+:


hooks/post-receive
-- 
GNU Automake