prune.exp: New file

2001-12-17  David Billinghurst <David.Billinghurst@riotinto.com>

	libstdc++/5136
	* testsuite/lib/prune.exp: New file
	* testsuite/lib/libstdc++-v3-dg.exp: Use it

From-SVN: r48133

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8ef11b77c83df6a7041414462130c13511687e0a..71b14daf116fd0d89486f6e20cda6b4f4f1cceab 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-17  David Billinghurst <David.Billinghurst@riotinto.com>
+
+       libstdc++/5136
+       * testsuite/lib/prune.exp: New file
+       * testsuite/lib/libstdc++-v3-dg.exp: Use it
+
 2001-12-17  Phil Edwards  <pme@gcc.gnu.org>
 
        * include/bits/basic_file.h (__basic_file::fd):  New function.

diff --git a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
index 6c0cb4abe1461c0c96b18b94d61e10310f9a3293..d63301c98c2228fa024cf91dfe192fb03d8ea1e4 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp
@@ -18,6 +18,7 @@
 
 load_lib dg.exp
 load_lib libgloss.exp
+load_lib prune.exp
 
 proc libstdc++-v3-copy-files {srcfiles dstdir} {
     foreach f $srcfiles {
@@ -146,6 +147,7 @@ proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } {
     }
 
     set comp_output [libstdc++-v3_target_compile "$prog" "$output_file" "$compile_type" $options];
+    set comp_output [ prune_g++_output $comp_output ];
 
     return [list $comp_output $output_file]
 }

diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp
new file mode 100644 (file)
index 0000000..3fcbf30
--- /dev/null
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -0,0 +1,25 @@
+#   Copyright (C) 1997, 1999, 2000, 2001 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# Prune messages from g++ that aren't useful.
+
+proc prune_g++_output { text } {
+
+    # Cygwin warns about -ffunction-sections
+    regsub -all "(^|\n)\[^\n\].*: -ffunction-sections may affect debugging on some targets.*" $text "" text
+
+    return $text
+}