testsuite_flags.in: Add -fmessage-length=0 to CXXFLAGS testsuite/lib/prune.exp...

2002-01-07  David Billinghurst <David.Billinghurst@riotinto.com>

	* testsuite_flags.in:  Add -fmessage-length=0 to CXXFLAGS
	testsuite/lib/prune.exp: Delete lines ":In function ..."
	from compiler output
	testsuite/23_containers/map_operators.cc: Remove
	dg-excess-errors comment
	testsuite/23_containers/set_operators.cc: Likewise

From-SVN: r48590

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4326fcbe9abc45b68dac675e2e0090b64658b568..6c605aa314c52a8259e29044f887c7c1e9fd2384 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-07  David Billinghurst <David.Billinghurst@riotinto.com>
+
+       * testsuite_flags.in:  Add -fmessage-length=0 to CXXFLAGS
+       testsuite/lib/prune.exp: Delete lines ":In function ..." 
+       from compiler output
+       testsuite/23_containers/map_operators.cc: Remove 
+       dg-excess-errors comment
+       testsuite/23_containers/set_operators.cc: Likewise
+
 2002-01-06  Paolo Carlini  <pcarlini@unitus.it>
 
        * include/bits/stl_function.h:  Remove two lines of comments;

diff --git a/libstdc++-v3/testsuite/23_containers/map_operators.cc b/libstdc++-v3/testsuite/23_containers/map_operators.cc
index 0ed96eb9fc5503627e021994d386d72ffb194f40..2ef57649d7f56d69f28e5447f66830e7f116de56 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/map_operators.cc
+++ b/libstdc++-v3/testsuite/23_containers/map_operators.cc
@@ -25,7 +25,6 @@
 #include <iostream>
 
 // { dg-do compile }
-// { dg-excess-errors "" }
 
 // libstdc++/86: map & set iterator comparisons are not type-safe
 void test01()

diff --git a/libstdc++-v3/testsuite/23_containers/set_operators.cc b/libstdc++-v3/testsuite/23_containers/set_operators.cc
index cafaff4818ba0e18610ade75efab6b02c54e8f11..f166ab9406e8ce87014cbd3f6a8e5fef40897981 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/set_operators.cc
+++ b/libstdc++-v3/testsuite/23_containers/set_operators.cc
@@ -24,7 +24,6 @@
 #include <string>
 
 // { dg-do compile }
-// { dg-excess-errors "" }
 
 // libstdc++/86: map & set iterator comparisons are not type-safe
 int main(void)

diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp
index 55c108056f2bc7517137970ccf3d5454267e32c2..7dc8eca131628b7c0dd3e070b7fe24307816af2a 100644 (file)
--- a/libstdc++-v3/testsuite/lib/prune.exp
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -21,5 +21,9 @@ proc prune_g++_output { text } {
     # Cygwin warns about -ffunction-sections
     regsub -all "(^|\n)\[^\n\]*: -ffunction-sections may affect debugging on some targets\[^\n\]*" $text "" text
 
+    # Remove parts of warnings that refer to location of previous
+    # definitions, etc as these confuse dejagnu
+    regsub -all "(^|\n)\[^\n\]*: In function \[^\n\]*" $text "" text
+
     return $text
 }

diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in
index 04a2c29f4448de6f492a962e53221d2c20a1c07c..1a24b5ed1f5b1b16f6235b03b5de58b12619b95f 100755 (executable)
--- a/libstdc++-v3/testsuite_flags.in
+++ b/libstdc++-v3/testsuite_flags.in
@@ -48,7 +48,8 @@ case ${query} in
       echo ${CXX}
       ;;
     --cxxflags)
-      CXXFLAGS=' -g @SECTION_FLAGS@ @SECTION_LDFLAGS@ 
+      CXXFLAGS=' -g @SECTION_FLAGS@ @SECTION_LDFLAGS@
+                -fmessage-length=0
                 -DDEBUG_ASSERT  -DLOCALEDIR="@glibcpp_localedir@" '
       echo ${CXXFLAGS}
       ;;