diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/testsuite/binutils-all/objcopy.exp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index a6e94c7..cddbd4c 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -26,7 +26,7 @@ if {[which $OBJCOPY] == 0} then { send_user "Version [binutil_version $OBJCOPY]" -if {![binutils_assemble $AS $srcdir$subdir/bintest.s tmpdir/bintest.o]} then { +if {![binutils_assemble $AS $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { unresolved "objcopy (simple copy)" return } @@ -56,7 +56,7 @@ if ![string match "" $got] then { setup_xfail "i*86-*-sysv3" "i*86-*-isc*" "i*86-*-sco*" "i*86-*-coff" setup_xfail "i*86-*-aix*" "i*86-*-go32*" setup_xfail "a29k-*-udi" "a29k-*-coff" "a29k-*-vxworks*" - setup_xfail "i960-*-vxworks*" "i960-*-coff" + setup_xfail "i960-*-coff" setup_xfail "h8300-*-hms" "h8300-*-coff" setup_xfail "h8500-*-hms" "h8500-*-coff" setup_xfail "hppa*-*-*" @@ -70,6 +70,12 @@ if ![string match "" $got] then { send_log "$exec_output\n" verbose "$exec_output" 1 + # On OSF/1, this succeeds with gas and fails with /bin/as. + setup_xfail "alpha*-*-osf*" + + # This fails for COFF i960-vxworks targets. + setup_xfail "i960-*-vxworks*" + fail "objcopy (simple copy)" } } @@ -87,19 +93,19 @@ if ![string match "" $got] then { gets $file line send_log "$line\n" verbose $line - if ![string match $line "S0130000746D706469722F636F70792E7372656397\r"] { + if ![string match "S0130000746D706469722F636F70792E7372656397*" $line] { send_log "bad header\n" fail "objcopy -O srec" } else { while {[gets $file line] != -1 \ - && [regexp "^S\[123\]\[0-9a-fA-F\]+\r$" $line]} { + && [regexp "^S\[123\]\[0-9a-fA-F\]+\[\r\n\]*$" $line]} { send_log "$line\n" verbose $line set line "**EOF**" } send_log "$line\n" verbose $line - if ![regexp "^S\[789\]\[0-9a-fA-F\]+\r$" $line] then { + if ![regexp "^S\[789\]\[0-9a-fA-F\]+\[\r\n\]*$" $line] then { send_log "bad trailer\n" fail "objcopy -O srec" } else { @@ -177,7 +183,7 @@ set lowname "" set headers [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/bintest.o"] -set headers_regexp "SECTION\[ 0-9\]+\\\[(\[^\]\]*)\\\]\[^\n\r\]*size\[ \]*(\[0-9a-fA-F\]+)\[0-9a-zA-Z \]*lma\[ \]*(\[0-9a-fA-F\]+)(.*)" +set headers_regexp "\[ 0-9\]+(\[^ \]+)\[ \]*(\[0-9a-fA-F\]+)\[ \]+\[0-9a-fA-F\]+\[ \]+(\[0-9a-fA-F\]+)\[ \]+\[0-9a-fA-F\]+\[ \]+2\[*\]\[*\]\[0-9\]+(.*)" set got $headers while {[regexp $headers_regexp $got all name size vma rest]} { @@ -200,7 +206,7 @@ if {$low == "" || $origstart == ""} then { fail "objcopy --adjust-vma" } else { set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -fh tmpdir/copy.srec"] - set want "file format srec.*start address\[ \]*(\[0-9a-fA-FxX\]+).*vma\[ \]*(\[0-9a-fA-F\]+)" + set want "file format srec.*start address\[ \]*(\[0-9a-fA-FxX\]+).*sec1\[ \]+\[0-9a-fA-F\]+\[ \]+(\[0-9a-fA-F\]+)" if ![regexp $want $got all start vma] then { fail "objcopy --adjust-vma" } else { @@ -234,7 +240,7 @@ if {$low == "" || $origstart == ""} then { fail "objcopy --adjust-section-vma +" } else { set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/copy.srec"] - set want "file format srec.*SECTION\[ \]*0\[^\n\r\]*vma\[ \]*(\[0-9a-fA-F\]+)" + set want "file format srec.*sec1\[ \]+\[0-9a-fA-F\]+\[ \]+(\[0-9a-fA-F\]+)" if ![regexp $want $got all vma] then { fail "objcopy --adjust-section-vma +" } else { @@ -254,7 +260,7 @@ if {$low == "" || $origstart == ""} then { fail "objcopy --adjust-section-vma =" } else { set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/copy.srec"] - set want "file format srec.*SECTION\[ \]*0\[^\n\r\]*vma\[ \]*(\[0-9a-fA-F\]+)" + set want "file format srec.*sec1\[ \]+\[0-9a-fA-F\]+\[ \]+(\[0-9a-fA-F\]+)" if ![regexp $want $got all vma] then { fail "objcopy --adjust-section-vma =" } else { |