diff options
| -rw-r--r-- | binutils/testsuite/binutils-all/.Sanitize | 31 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/objdump.exp | 18 |
2 files changed, 44 insertions, 5 deletions
diff --git a/binutils/testsuite/binutils-all/.Sanitize b/binutils/testsuite/binutils-all/.Sanitize index 70a2ae5..4132bf3 100644 --- a/binutils/testsuite/binutils-all/.Sanitize +++ b/binutils/testsuite/binutils-all/.Sanitize @@ -1,4 +1,4 @@ -# .Sanitize for deja-gnu. +# .Sanitize for devo/binutils/testsuite/binutils-all. # Each directory to survive it's way into a release will need a file # like this one called "./.Sanitize". All keyword lines must exist, @@ -76,6 +76,35 @@ else done fi +sky_files="objdump.exp" + +if ( echo $* | grep keep\-sky > /dev/null ) ; then + for i in $sky_files ; do + if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Keeping sky stuff in $i + fi + fi + done +else + for i in * ; do + if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then + if [ -n "${verbose}" ] ; then + echo Removing traces of \"sky\" from $i... + fi + cp $i new + sed '/start\-sanitize\-sky/,/end-\sanitize\-sky/d' < $i > new + if [ -n "${safe}" -a ! -f .Recover/$i ] ; then + if [ -n "${verbose}" ] ; then + echo Caching $i in .Recover... + fi + mv $i .Recover + fi + mv new $i + fi + done +fi + for i in * ; do if test ! -d $i && (grep sanitize $i > /dev/null) ; then echo '***' Some mentions of Sanitize are still left in $i! 1>&2 diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index bb490e7..f208fb1 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -20,9 +20,11 @@ # This file was written by Rob Savoye <rob@cygnus.com> # and rewritten by Ian Lance Taylor <ian@cygnus.com> -if {[which $OBJDUMP] == 0} then { - perror "$OBJDUMP does not exist" - return +if ![is_remote host] { + if {[which $OBJDUMP] == 0} then { + perror "$OBJDUMP does not exist" + return + } } send_user "Version [binutil_version $OBJDUMP]" @@ -33,8 +35,16 @@ set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"] set cpus_expected "(a29k|alliant|alpha|arc|arm|convex|d10v|h8|hppa|i386|i860|i960|m32r|m68k|m88k|mips|mn10200|mn10300|ns32k|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|vax|we32k|z8k|z8001|z8002)" # start-sanitize-d30v -set cpus_expected "(a29k|alliant|alpha|arm|convex|d10v|h8|hppa|i386|i860|i960|d30v|m32r|m68k|m88k|mips|mn10200|mn10300|ns32k|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|vax|we32k|z8k|z8001|z8002)" +set cpus_expected "(a29k|alliant|alpha|arc|arm|convex|d10v|h8|hppa|i386|i860|i960|d30v|m32r|m68k|m88k|mips|mn10200|mn10300|ns32k|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|vax|we32k|z8k|z8001|z8002)" # end-sanitize-d30v +# start-sanitize-sky +set cpus_expected "(a29k|alliant|alpha|arc|arm|convex|d10v|h8|hppa|i386|i860|i960|m32r|m68k|m88k|mips|mn10200|mn10300|ns32k|powerpc|pyramid|romp|rs6000|sh|sparc|tahoe|txvu|vax|we32k|z8k|z8001|z8002)" +# end-sanitize-sky + +# Make sure the target CPU shows up in the list. +if ![regexp $cpus_expected $target_cpu] { + regsub "^\[(\]" "$cpus_expected" "(${target_cpu}|" cpus_expected; +} set want "BFD header file version.*srec.*header .* endian.*, data .* endian.*$cpus_expected" |