diff options
| -rw-r--r-- | binutils/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/objdump.exp | 23 |
2 files changed, 21 insertions, 7 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index aec6262..95434fd 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2000-07-01 Frank Ch. Eigler <fche@redhat.com> + + * binutils-all/objdump.exp (cpus_expected, cpus_regex): Reorganize + syntax to display more tcl nature. + 2000-06-18 Stephane Carrez <stcarrez@worldnet.fr> * binutils-all/objdump.exp (cpus_expected): Recognize m68hc11 and diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index e9e5f0d..d901eab 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 1996, 2000 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 @@ -33,14 +33,23 @@ send_user "Version [binutil_version $OBJDUMP]" set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"] -set cpus_expected "(a29k|alliant|alpha|arc|arm|convex|d10v|d30v|fr30|h8|hppa|i386|i860|i960|m32r|m68hc11|m68hc12|m68k|m88k|MCore|mips|mn10200|mn10300|ns32k|pj|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|v850|vax|we32k|z8k|z8001|z8002)" +set cpus_expected [list] +lappend cpus_expected a29k alliant alpha arc arm convex +lappend cpus_expected d10v d30v fr30 h8 hppa i386 i860 i960 +lappend cpus_expected m32r m68hc11 m68hc12 m68k m88k MCore +lappend cpus_expected mips mn10200 mn10300 ns32k pj powerpc pyramid +lappend cpus_expected romp rs6000 sh sparc tahoe v850 +lappend cpus_expected vax we32k z8k z8001 z8002 # Make sure the target CPU shows up in the list. -if ![regexp $cpus_expected $target_cpu] { - regsub "^\[(\]" "$cpus_expected" "(${target_cpu}|" cpus_expected; -} +lappend cpus_expected ${target_cpu} + +# Create regexp +set cpus_regex "([join $cpus_expected | ])" + +verbose -log "CPU regex: $cpus_regex" -set want "BFD header file version.*srec\[^\n\]*\n\[^\n\]*header \[^\n\]*endian\[^\n\]*, data \[^\n\]*endian.*$cpus_expected" +set want "BFD header file version.*srec\[^\n\]*\n\[^\n\]*header \[^\n\]*endian\[^\n\]*, data \[^\n\]*endian.*$cpus_regex" if [regexp $want $got] then { pass "objdump -i" @@ -64,7 +73,7 @@ if [is_remote host] { set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f $testfile"] -set want "$testfile:\[ \]*file format.*architecture:\[ \]*${cpus_expected}.*HAS_RELOC.*HAS_SYMS" +set want "$testfile:\[ \]*file format.*architecture:\[ \]*${cpus_regex}.*HAS_RELOC.*HAS_SYMS" if ![regexp $want $got] then { fail "objdump -f" |