Merge branch 'fix-silentf77-sun-fortran' into maint

3 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b263eca6..e3618a776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-11-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	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  <stefano.lattarini@gmail.com>
+
 	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,
diff --git a/tests/silentf77.test b/tests/silentf77.test
index 39495d4ad..54a15a117 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 9330bddd0..6435fb411 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
+
+: