* binutils-all/objcopy.exp (strip_test_with_saving_a_symbol):

	Revert 2001-11-15.  Instead allow `D main'.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 74587d08c354c21cf18699ecb9b759df49c209f2..92984988a9cafdb9daf1c84196fa4d7515034700 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-29  Alan Modra  <amodra@bigpond.net.au>
+
+       * binutils-all/objcopy.exp (strip_test_with_saving_a_symbol):
+       Revert 2001-11-15.  Instead allow `D main'.
+
 2002-04-16  Eric Kohl <ekohl@rz-online.de>
 
        * binutils-all/windres/dialog0.rc: New test case: Check default
@@ -11,7 +16,7 @@
 
        * binutils-all/windres/dlgfont.rc: New test case: Checks FONT
        statement in DIALOG and DIALOGEX resources.
-        * binutils-all/windres/dlgfont.rsd: Expected output.
+       * binutils-all/windres/dlgfont.rsd: Expected output.
 
 2002-04-11  Nick Clifton  <nickc@cambridge.redhat.com>
 
@@ -81,7 +86,7 @@
 2002-02-13  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * binutils-all/readelf.ss-mips: Do not expect an explicit
-        ordering of the sections.
+       ordering of the sections.
 
 2002-02-10  Nick Clifton  <nickc@cambridge.redhat.com>
 
@@ -99,7 +104,8 @@
 
 2001-11-15  Alan Modra  <amodra@bigpond.net.au>
 
-       * binutils-all/objcopy.exp: Allow '? main', to suit powerpc64.
+       * binutils-all/objcopy.exp: (strip_test_with_saving_a_symbol):
+       Allow '? main', to suit powerpc64.
 
 2001-11-14  Geoffrey Keating  <geoffk@redhat.com>
 
@@ -218,20 +224,20 @@ Tue Sep  4 20:25:41 2001  Jeffrey A Law  (law@cygnus.com)
 
 2000-11-02  Chris Demetriou  <cgd@sibyte.com>
 
-        * binutils-all/readelf.exp (regexp_diff): Add code
-        from gas testsuite to treat "#..." at beginning of line
-        as an indicator to skip extra non-matching lines at that
-        location.
-        (readelf_test): Add support for using a machine-specific
-        regexp comparison file.
-        (readelf -S test, readelf -s test): Remove v850*-*-* and
-        mips*-*-* from list of expected failures.
-        * binutils-all/readelf.s: Accomodate changes due to
-        additional sections (and therefore section numbering
-        differences) on v850*-*-* and mips*-*-* targets.
-        * binutils-all/readelf.ss: Likewise.
-        * binutils-all/readelf.ss-mips: New file, which matches
-        expected output of readelf -s test for mips*-*-*.
+       * binutils-all/readelf.exp (regexp_diff): Add code
+       from gas testsuite to treat "#..." at beginning of line
+       as an indicator to skip extra non-matching lines at that
+       location.
+       (readelf_test): Add support for using a machine-specific
+       regexp comparison file.
+       (readelf -S test, readelf -s test): Remove v850*-*-* and
+       mips*-*-* from list of expected failures.
+       * binutils-all/readelf.s: Accomodate changes due to
+       additional sections (and therefore section numbering
+       differences) on v850*-*-* and mips*-*-* targets.
+       * binutils-all/readelf.ss: Likewise.
+       * binutils-all/readelf.ss-mips: New file, which matches
+       expected output of readelf -s test for mips*-*-*.
 
 2000-10-25  Hans-Peter Nilsson  <hp@axis.com>
 
@@ -239,10 +245,10 @@ Tue Sep  4 20:25:41 2001  Jeffrey A Law  (law@cygnus.com)
 
 2000-10-19  Chris Demetriou  <cgd@sibyte.com>
 
-        * binutils-all/readelf.exp (readelf_test): Work properly
-        when multiple targets expect failtures.
-        (readelf -S test, readelf -s test): Expect mips*-*-*
-        to fail.
+       * binutils-all/readelf.exp (readelf_test): Work properly
+       when multiple targets expect failtures.
+       (readelf -S test, readelf -s test): Expect mips*-*-*
+       to fail.
 
 2000-07-10  Alan Modra  <alan@linuxcare.com.au>
 
@@ -837,7 +843,7 @@ Thu Jun 30 12:41:55 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
 Tue May 17 14:04:05 1994  Bill Cox  (bill@rtl.cygnus.com)
 
        * config/default.exp, config/unix.exp: Replace error
-         proc calls with perror.
+       proc calls with perror.
 
 Tue May 10 11:20:54 1994  Stan Shebs  (shebs@andros.cygnus.com)
 

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 470b36974a48496a54890ffaaf6e4ebcb68d4eb0..3eb339ba037b991732477ccb6bba12968a8d2532 100644 (file)
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -412,7 +412,7 @@ proc strip_test_with_saving_a_symbol { } {
     }
 
     set exec_output [binutils_run $NM "$NMFLAGS $objfile"]
-    if {![regexp {^([0-9a-fA-F]+)?[ ]+[T\?] main} $exec_output] \
+    if {![regexp {^([0-9a-fA-F]+)?[ ]+[TD] main} $exec_output] \
          && ![regexp {^([0-9a-fA-F]+)?[ ]+T _main} $exec_output]} {
        fail $test
        return