* lib/utils-lib.exp (default_binutils_assemble): Call

prune_system_crud on assembler output.
This commit is contained in:
Ian Lance Taylor 1995-10-02 16:42:47 +00:00
parent a19f84a79b
commit a6eed1d25f
2 changed files with 39 additions and 1 deletions

View file

@ -1,3 +1,13 @@
Mon Oct 2 12:41:48 1995 Ian Lance Taylor <ian@cygnus.com>
* lib/utils-lib.exp (default_binutils_assemble): Call
prune_system_crud on assembler output.
Tue Sep 26 14:07:05 1995 Ian Lance Taylor <ian@cygnus.com>
* binutils-all/objcopy.exp: Add setup_xfails for simple copy test
for i386 COFF targets.
Wed Sep 13 13:20:21 1995 Ian Lance Taylor <ian@cygnus.com>
* lib/utils-lib.exp (prune_system_crud): Define if not defined.

View file

@ -12,7 +12,7 @@
#
# 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. */
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Please email any bugs, comments, and/or additions to this file to:
# bug-dejagnu@prep.ai.mit.edu
@ -105,6 +105,8 @@ proc default_binutils_assemble { as source object } {
catch "exec $as $ASFLAGS -o $object $source" exec_output
}
set exec_output [prune_system_crud $host_triplet $exec_output]
if [string match "" $exec_output] then {
return 1
} else {
@ -114,3 +116,29 @@ proc default_binutils_assemble { as source object } {
return 0
}
}
# This definition is taken from an unreleased version of DejaGnu. Once
# that version gets released, and has been out in the world for a few
# months at least, it may be safe to delete this copy.
if ![string length [info proc prune_system_crud]] {
#
# prune_system_crud -- delete various system verbosities from TEXT on SYSTEM
#
# An example is:
# ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9
#
# SYSTEM is typical $target_triplet or $host_triplet.
#
# This is useful when trying to do pattern matches on program output.
# Sites with particular verbose os's may wish to override this in site.exp.
#
proc prune_system_crud { system text } {
# This is from sun4's. Do it for all machines for now.
# The "\\1" is to try to preserve a "\n" but only if necessary.
regsub -all "(^|\n)(ld.so: warning:\[^\n\]*\n?)+" $text "\\1" text
# It might be tempting to get carried away and delete blank lines, etc.
# Just delete *exactly* what we're ask to, and that's it.
return $text
}
}