* binutils-all/objcopy.exp: Polish output about fail for objcopy

(simple copy), strip with/without saving a symbol for object file
	and executable.
This commit is contained in:
Vladimir Makarov 1998-07-22 18:10:50 +00:00
parent 39e4bca406
commit 862a531349
2 changed files with 227 additions and 56 deletions

View File

@ -1,3 +1,9 @@
1998-07-22 Vladimir N. Makarov <vmakarov@cygnus.com>
* binutils-all/objcopy.exp: Polish output about fail for objcopy
(simple copy), strip with/without saving a symbol for object file
and executable.
Wed Jul 1 16:27:40 1998 Nick Clifton <nickc@cygnus.com>
* binutils-all/objcopy.exp: ARM simple objcopy now passes.

View File

@ -1,4 +1,4 @@
# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
# Copyright (C) 1994, 95, 96, 97, 1998 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
@ -19,29 +19,50 @@
# Written by Ian Lance Taylor <ian@cygnus.com>
if {[which $OBJCOPY] == 0} then {
perror "$OBJCOPY does not exist"
return
if ![is_remote host] {
if {[which $OBJCOPY] == 0} then {
perror "$OBJCOPY does not exist"
return
}
}
send_user "Version [binutil_version $OBJCOPY]"
if {![binutils_assemble $AS $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then {
if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then {
perror "unresolved 1"
unresolved "objcopy (simple copy)"
return
}
if ![is_remote host] {
set tempfile tmpdir/bintest.o;
set copyfile tmpdir/copy;
} else {
set tempfile [remote_download host tmpdir/bintest.o]
set copyfile copy
}
# Test that objcopy does not modify a file when copying it.
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS tmpdir/bintest.o tmpdir/copy.o"]
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS $tempfile ${copyfile}.o"]
if ![string match "" $got] then {
fail "objcopy (simple copy)"
} else {
send_log "cmp tmpdir/bintest.o tmpdir/copy.o\n"
verbose "cmp tmpdir/bintest.o tmpdir/copy.o"
catch "exec cmp tmpdir/bintest.o tmpdir/copy.o" exec_output
set exec_output [prune_system_crud $host_triplet $exec_output]
send_log "cmp $tempfile ${copyfile}.o\n"
verbose "cmp $tempfile ${copyfile}.o"
if [is_remote host] {
set src1 tmpdir/bintest.o
set src2 tmpdir/copy.o
remote_upload host $tempfile $src1;
remote_upload host ${copyfile}.o $src2;
} else {
set src1 ${tempfile}
set src2 ${copyfile}.o
}
set status [remote_exec build cmp "${src1} ${src2}"];
set exec_output [lindex $status 1];
set exec_output [prune_warnings $exec_output]
# On some systems the result of objcopy will not be identical.
# Usually this is just because gas isn't using bfd to write the files
@ -49,7 +70,6 @@ if ![string match "" $got] then {
# Those systems should use setup_xfail here.
setup_xfail "sh-*-coff" "sh-*-hms"
setup_xfail "arm-*-pe"
setup_xfail "m68*-*-hpux*" "m68*-*-sunos*" "m68*-*-coff" "m68*-*-vxworks*"
setup_xfail "m68*-ericsson-ose" "m68k*-motorola-sysv*"
setup_xfail "i*86-*-linuxaout*" "i*86-*-aout*"
@ -82,18 +102,33 @@ if ![string match "" $got] then {
# Test generating S records.
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec"]
# We make the srec filename 8.3 compatible. Note that the header string
# matched against depends on the name of the file. Ugh.
if [is_remote host] {
set srecfile copy.sre
set header_string S00B0000636F70792E737265C1
} else {
set srecfile ${copyfile}.srec
set header_string S0130000746D706469722F636F70792E7372656397
}
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${srecfile}"]
if ![string match "" $got] then {
fail "objcopy -O srec"
} else {
set file [open tmpdir/copy.srec r]
if [is_remote host] {
remote_upload host ${srecfile} tmpdir/copy.srec;
set srecfile tmpdir/copy.srec;
}
set file [open ${srecfile} r]
# The first S record is fixed by the file name we are using.
gets $file line
send_log "$line\n"
verbose $line
if ![string match "S0130000746D706469722F636F70792E7372656397*" $line] {
if ![regexp "$header_string.*" $line] {
send_log "bad header\n"
fail "objcopy -O srec"
} else {
@ -115,7 +150,7 @@ if ![string match "" $got] then {
verbose $line
fail "objcopy -O srec"
} else {
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/copy.srec"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${copyfile}.srec"]
if ![regexp "file format srec" $got] then {
send_log "objdump failed\n"
fail "objcopy -O srec"
@ -134,16 +169,16 @@ if ![string match "" $got] then {
# start address for other object file formats, and the S record case
# is the only useful one anyhow.
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/bintest.o"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f $tempfile"]
if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
perror "objdump can not recognize bintest.o"
set origstart ""
} else {
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec --set-start 0x7654"]
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --set-start 0x7654"]
if ![string match "" $got] then {
fail "objcopy --set-start"
} else {
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/copy.srec"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${copyfile}.srec"]
if ![regexp "file format srec.*start address (\[0-9a-fA-FxX\]+)" $got all srecstart] then {
fail "objcopy --set-start"
} else {
@ -156,11 +191,11 @@ if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
}
}
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec --adjust-start 0x123"]
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --adjust-start 0x123"]
if ![string match "" $got] then {
fail "objcopy --adjust-start"
} else {
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/copy.srec"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f ${copyfile}.srec"]
if ![regexp "file format srec.*start address (\[0-9a-fA-FxX\]+)" $got all srecstart] then {
fail "objcopy --adjust-start"
} else {
@ -181,7 +216,7 @@ if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
set low ""
set lowname ""
set headers [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/bintest.o"]
set headers [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h $tempfile"]
set headers_regexp "\[ 0-9\]+(\[^ \]+)\[ \]*(\[0-9a-fA-F\]+)\[ \]+\[0-9a-fA-F\]+\[ \]+(\[0-9a-fA-F\]+)\[ \]+\[0-9a-fA-F\]+\[ \]+2\[*\]\[*\]\[0-9\]+(.*)"
@ -201,11 +236,11 @@ while {[regexp $headers_regexp $got all name size vma rest]} {
if {$low == "" || $origstart == ""} then {
perror "objdump can not recognize bintest.o"
} else {
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec --adjust-vma 0x123"]
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --adjust-vma 0x123"]
if ![string match "" $got] then {
fail "objcopy --adjust-vma"
} else {
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -fh tmpdir/copy.srec"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -fh ${copyfile}.srec"]
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"
@ -235,11 +270,11 @@ if {$low == "" || $origstart == ""} then {
set got $rest
}
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec $arg"]
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec $arg"]
if ![string match "" $got] then {
fail "objcopy --adjust-section-vma +"
} else {
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/copy.srec"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h ${copyfile}.srec"]
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 +"
@ -255,11 +290,11 @@ if {$low == "" || $origstart == ""} then {
}
regsub -all "\\+4" $arg "=[expr $low + 4]" argeq
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec $argeq"]
set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec $argeq"]
if ![string match "" $got] then {
fail "objcopy --adjust-section-vma ="
} else {
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/copy.srec"]
set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h ${copyfile}.srec"]
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 ="
@ -288,23 +323,24 @@ proc strip_test { } {
set test "strip"
if { [which $CC] == 0 } {
if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog.o object debug] != "" } {
untested $test
return
}
if ![binutils_compile $CC "-g -c" $srcdir/$subdir/testprog.c tmpdir/testprog.o] {
unresolved $test
return
if [is_remote host] {
set objfile [remote_download host tmpdir/testprog.o];
} else {
set objfile tmpdir/testprog.o
}
set exec_output [binutils_run $STRIP "$STRIPFLAGS tmpdir/testprog.o"]
set exec_output [binutils_run $STRIP "$STRIPFLAGS $objfile"]
if ![string match "" $exec_output] {
fail $test
return
}
set exec_output [binutils_run $NM "-a $NMFLAGS tmpdir/testprog.o"]
set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
if ![string match "No symbols in *" $exec_output] {
fail $test
return
@ -315,27 +351,72 @@ proc strip_test { } {
strip_test
# Build a final executable.
# Test stripping an object file with saving a symbol
proc copy_setup { } {
proc strip_test_with_saving_a_symbol { } {
global CC
global STRIP
global STRIPFLAGS
global NM
global NMFLAGS
global srcdir
global subdir
if ![isnative] {
return 1
set test "strip with saving a symbol"
if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog.o object debug] != "" } {
untested $test
return
}
if { [which $CC] == 0 } {
if [is_remote host] {
set objfile [remote_download host tmpdir/testprog.o];
} else {
set objfile tmpdir/testprog.o
}
set exec_output [binutils_run $STRIP "$STRIPFLAGS -K main $objfile"]
if ![string match "" $exec_output] {
fail $test
return
}
set exec_output [binutils_run $NM "$NMFLAGS $objfile"]
if ![regexp {^([0-9a-fA-F]+)?[ ]+T main} $exec_output] {
fail $test
return
}
pass $test
}
strip_test_with_saving_a_symbol
# Build a final executable.
proc copy_setup { } {
global srcdir
global subdir
set res [build_wrapper testglue.o];
set flags { debug };
if { $res != "" } {
lappend flags "additional_flags=[lindex $res 1]";
set add_libs "testglue.o";
} else {
set add_libs "";
}
if { [target_compile "$srcdir/$subdir/testprog.c $add_libs" tmpdir/testprog executable $flags] != "" } {
return 2
}
if ![binutils_compile $CC "-g" $srcdir/$subdir/testprog.c tmpdir/testprog] {
return 3
}
set result [remote_load target tmpdir/testprog];
set status [lindex $result 0];
set exec_output [binutils_run tmpdir/testprog ""]
if ![string match "ok" $exec_output] {
if { $status != "pass" } {
perror "unresolved setup, status = $status"
return 3
}
@ -346,31 +427,53 @@ proc copy_setup { } {
proc copy_executable { prog flags test1 test2 } {
set exec_output [binutils_run $prog "$flags tmpdir/testprog tmpdir/copyprog"]
if [is_remote host] {
set testfile [remote_download host tmpdir/testprog];
set testcopy copyprog
} else {
set testfile tmpdir/testprog
set testcopy tmpdir/copyprog
}
remote_file host delete $testcopy;
set exec_output [binutils_run $prog "$flags $testfile $testcopy"]
if ![string match "" $exec_output] {
fail $test1
fail $test2
return
}
set exec_output [binutils_run "cmp" "tmpdir/testprog tmpdir/copyprog"]
if [is_remote host] {
remote_upload host $testcopy tmpdir/copyprog
}
set status [remote_exec build "cmp" "tmpdir/testprog tmpdir/copyprog"]
set exec_output [lindex $status 1];
if [string match "" $exec_output] then {
pass $test1
} else {
send_log "$exec_output\n"
verbose "$exec_output"
# This will fail for many reasons. For example, it will most
# likely fail if the system linker is used. Therefore, we do
# likely fail if a non-GNU linker is used. Therefore, we do
# not insist that it pass. If you are using an assembler and
# linker based on the same BFD as objcopy, it is worth
# investigating to see why this failure occurs.
setup_xfail "*-*-*"
# investigating to see why this failure occurs. If we are
# cross compiling, we assume that a GNU linker is being used,
# and expect it to succeed.
if {[isnative]} then {
setup_xfail "*-*-*"
}
fail $test1
}
set exec_output [binutils_run tmpdir/copyprog ""]
if ![string match "ok" $exec_output] {
set output [remote_load target tmpdir/copyprog]
set status [lindex $output 0];
if { $status != "pass" } {
fail $test2
} else {
pass $test2
@ -380,24 +483,83 @@ proc copy_executable { prog flags test1 test2 } {
# Test stripping an executable
proc strip_executable { prog flags test } {
global NM
global NMFLAGS
set exec_output [binutils_run $prog "$flags tmpdir/copyprog"]
remote_download build tmpdir/copyprog tmpdir/striprog
if [is_remote host] {
set copyfile [remote_download host tmpdir/striprog];
} else {
set copyfile tmpdir/striprog
}
set exec_output [binutils_run $prog "$flags ${copyfile}"]
if ![string match "" $exec_output] {
fail $test
return
}
set exec_output [binutils_run tmpdir/copyprog ""]
if ![string match "ok" $exec_output] {
fail $test
} else {
pass $test
if [is_remote host] {
remote_upload host ${copyfile} tmpdir/striprog;
}
set result [remote_load target tmpdir/striprog]
set status [lindex $result 0];
if { $status != "pass" } {
fail $test
return
}
set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
if ![string match "$copyfile: no symbols*" $exec_output] {
fail $test
return
}
pass $test
}
# Test stripping an executable with saving a symbol
proc strip_executable_with_saving_a_symbol { prog flags test } {
global NM
global NMFLAGS
remote_download build tmpdir/copyprog tmpdir/striprog
if [is_remote host] {
set copyfile [remote_download host tmpdir/striprog];
} else {
set copyfile tmpdir/striprog
}
set exec_output [binutils_run $prog "$flags ${copyfile}"]
if ![string match "" $exec_output] {
fail $test
return
}
if [is_remote host] {
remote_upload host ${copyfile} tmpdir/striprog;
}
set result [remote_load target tmpdir/striprog]
set status [lindex $result 0];
if { $status != "pass" } {
fail $test
return
}
set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
if ![regexp {^[0-9a-fA-F]+ T main} $exec_output] {
fail $test
return
}
pass $test
}
set test1 "simple objcopy of executable"
set test2 "run objcopy of executable"
set test3 "run stripped executable"
set test4 "run stripped executable with saving a symbol"
switch [copy_setup] {
"1" {
@ -407,14 +569,17 @@ switch [copy_setup] {
untested $test1
untested $test2
untested $test3
untested $test4
}
"3" {
unresolved $test1
unresolved $test2
unresolved $test3
unresolved $test4
}
"0" {
copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" "$test2"
strip_executable "$STRIP" "$STRIPFLAGS" "$test3"
strip_executable_with_saving_a_symbol "$STRIP" "-K main $STRIPFLAGS" "$test4"
}
}