Re: RFA/PATCH: binutils/testsuite/binutils-all/objdump.exp

Re: RFA/PATCH: binutils/testsuite/binutils-all/objdump.exp

[Nick Clifton]

Hi Frank,

: The following patch cleans up code that generates a target-set-dependent
: regular expression for `objdump' result matching.   May I commit?
: 
: 2000-06-28  Frank Ch. Eigler  <fche@redhat.com>
: 
: 	* binutils-all/objdump.exp (cpus_expected, cpus_regex): Reorganize
: 	syntax to display more tcl nature.

Approved.

: -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 {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}

Would it be possible to change this so that each processor has its own
line ?  Or maybe a few processors per line ?  This would help to keep
the code to the 80 column width limit, and also make patches to add
new processors slightly easier to read.

Cheers
	Nick

RFA/PATCH: binutils/testsuite/binutils-all/objdump.exp

[Frank Ch. Eigler]

Hi -

The following patch cleans up code that generates a target-set-dependent
regular expression for `objdump' result matching.   May I commit?

2000-06-28  Frank Ch. Eigler  <fche@redhat.com>

	* binutils-all/objdump.exp (cpus_expected, cpus_regex): Reorganize
	syntax to display more tcl nature.
 
Index: binutils-all/objdump.exp
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/binutils-all/objdump.exp,v
retrieving revision 1.5
diff -p -u -r1.5 objdump.exp
--- objdump.exp	2000/06/19 01:22:39	1.5
+++ objdump.exp	2000/06/28 20:25:38
@@ -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,18 @@ send_user "Version [binutil_version $OBJ
 
 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 {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}
 
+
 # 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 +68,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"