diff options
author | Hans-Peter Nilsson <hp@axis.com> | 2002-02-18 09:19:51 +0000 |
---|---|---|
committer | Hans-Peter Nilsson <hp@axis.com> | 2002-02-18 09:19:51 +0000 |
commit | 71310c2aa0b446dbec4af7e1733e568dcbfbd1b0 (patch) | |
tree | 446057003c7c5b83b7c234586d843e2e6b7a4919 | |
parent | ce0c32e95a5b7e4d7883f3d3c9ed045fa553e346 (diff) | |
download | binutils-redhat-71310c2aa0b446dbec4af7e1733e568dcbfbd1b0.tar.gz |
* binutils-all/objcopy.exp
(strip_executable_with_saving_a_symbol): Prune symbol Main in nm
output for mmix-knuth-mmixware.
-rw-r--r-- | binutils/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | binutils/testsuite/binutils-all/objcopy.exp | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index ca11a15fbe..8c8b11b0f1 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2002-02-18 Hans-Peter Nilsson <hp@bitrange.com> + + * binutils-all/objcopy.exp + (strip_executable_with_saving_a_symbol): Prune symbol Main in nm + output for mmix-knuth-mmixware. + 2002-02-12 Nick Clifton <nickc@cambridge.redhat.com> * binutils-all/readelf.ss-mips: Do not expect an explicit diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index 22efb5da0b..470b36974a 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -596,6 +596,15 @@ proc strip_executable_with_saving_a_symbol { prog flags test } { } set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"] + if { [istarget mmix-knuth-mmixware] } { + # Whenever there's a symbol in the mmo format, there's the symbol + # Main, so remove it manually from the expected output for sake of + # this test. + + # Using "" not {} to get the \n and \r translated. + regsub "^\[0-9a-fA-F\]+\[ \]+T Main\[\n\r\]+" $exec_output "" exec_output + } + if {![regexp {^[0-9a-fA-F]+ T main} $exec_output] \ && ![regexp {^[0-9a-fA-F]+ T _main} $exec_output]} { fail $test |