* binutils-all/objcopy.exp: New file.

	* config/default.exp: Initialize OBJCOPY and OBJCOPYFLAGS.

3 files changed, 271 insertions, 2 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index f587bd5..9e6a1c1 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,7 +1,38 @@
+Tue Oct 18 11:18:21 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	* binutils-all/nm.exp: nm with no arguments and nm -P do not work
+	as expected on ECOFF targets; add calls to setup_xfail.
+
+	* binutils-all/objcopy.exp: New file.
+	* config/default.exp: Initialize OBJCOPY and OBJCOPYFLAGS.
+
+Fri Oct 14 14:46:22 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
+
+	Rewrite testsuite.
+	* configure.in, Makefile.in: Remove.
+	* binutils-all/configure.in, binutils-all/Makefile.in: Remove.
+	* binutils-all/bintest.c: Remove.
+	* binutils-all/bintest.s: New file.
+	* binutils-all/nm.exp, binutils-all/objdump.exp: Rewrite.
+	* binutils-all/size.exp: Rewrite.
+	* config/default.exp: Load utils-lib.exp.  Set AS and ASFLAGS.
+	Don't go up one directory from $base_dir.  Create tmpdir.
+	(binutils_run, binutils-assemble): New procedures.
+	* config/unix.exp: Remove.
+	* config/mt-a29k-udi, config/mt-i386-aout: Remove.
+	* config/mt-i960-nindy, config/mt-lynx, config/mt-m68k: Remove.
+	* config/mt-mips-ecoff, config/mt-slite: Remove.
+	* config/mt-sparc-aout, config/mt-vxworks: Remove.
+	* lib/utils-lib.exp (binutil_version): Don't redirect standard
+	input when getting version.  Don't unset errorInfo.
+	(default_binutils_run): New procedure.
+	(default_binutils_assemble): New procedure.
+
 Thu Sep 29 12:45:39 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
-	* VMS does not permits `.' in directory names.  Renamed
-	binutils.all to binutils-all.
+	* VMS does not permit `.' in directory names: renamed binutils.all
+	to binutils-all.
+	* configure.in (configdirs): Change binutils.all to binutils-all.
 
 Fri Sep 23 16:01:14 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
diff --git a/binutils/testsuite/binutils-all/.Sanitize b/binutils/testsuite/binutils-all/.Sanitize
index 9450ce7..6169344 100644
--- a/binutils/testsuite/binutils-all/.Sanitize
+++ b/binutils/testsuite/binutils-all/.Sanitize
@@ -25,6 +25,7 @@ Things-to-keep:
 
 bintest.s
 nm.exp
+objcopy.exp
 objdump.exp
 size.exp
 
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
new file mode 100644
index 0000000..17d70ff
--- /dev/null
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -0,0 +1,237 @@
+#   Copyright (C) 1994 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-dejagnu@prep.ai.mit.edu
+
+# Written by Ian Lance Taylor <ian@cygnus.com>
+
+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 {
+    return
+}
+
+# Test that objcopy does not modify a file when copying it.
+
+set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS tmpdir/bintest.o tmpdir/copy.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
+
+    # On some systems the result of objcopy will not be identical.
+    # Those systems should use setup_xfail here.
+
+    if [string match "" $exec_output] then {
+	pass "objcopy (simple copy)"
+    } else {
+	send_log "$exec_output\n"
+	verbose "$exec_output" 1
+
+	fail "objcopy (simple copy)"
+    }
+}
+
+# Test generating S records.
+
+set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec"]
+
+if ![string match "" $got] then {
+    fail "objcopy -O srec"
+} else {
+    set file [open tmpdir/copy.srec 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 $line "S0130000746D706469722F636F70792E7372656397\r"] {
+	fail "objcopy -O srec (bad header)"
+    } else {
+	while {[gets $file line] != -1 \
+	       && [regexp "^S\[123\]\[0-9a-fA-F\]+\r$" $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 {
+	    fail "objcopy -O srec (bad trailer)"
+	} else {
+	    if {[gets $file line] != -1} then {
+		send_log "$line\n"
+		verbose $line
+		fail "objcopy -O srec (garbage at end)"
+	    } else {
+		set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/copy.srec"]
+		if ![regexp "file format srec" $got] then {
+		    fail "objcopy -O srec (objdump failed)"
+		} else {
+		    pass "objcopy -O srec"
+		}
+	    }
+	}
+    }
+
+    close $file
+}
+
+# Test setting and adjusting the start address.  We only test this
+# while generating S records, because we may not be able to set the
+# 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"]
+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"]
+    if ![string match "" $got] then {
+	fail "objcopy --set-start"
+    } else {
+	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/copy.srec"]
+	if ![regexp "file format srec.*start address (\[0-9a-fA-FxX\]+)" $got all srecstart] then {
+	    fail "objcopy --set-start"
+	} else {
+	    if {$srecstart != 0x7654} then {
+		fail "objcopy --set-start ($srecstart != 0x7654)"
+	    } else {
+		pass "objcopy --set-start"
+	    }
+	}
+    }
+
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec --adjust-start 0x123"]
+    if ![string match "" $got] then {
+	fail "objcopy --adjust-start"
+    } else {
+	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -f tmpdir/copy.srec"]
+	if ![regexp "file format srec.*start address (\[0-9a-fA-FxX\]+)" $got all srecstart] then {
+	    fail "objcopy --adjust-start"
+	} else {
+	    if {$srecstart != $origstart + 0x123} then {
+		fail "objcopy --adjust-start ($srecstart != $origstart + 0x123)"
+	    } else {
+		pass "objcopy --adjust-start"
+	    }
+	}
+    }
+}
+
+# Test adjusting the overall VMA, and adjusting the VMA of a
+# particular section.  We again only test this when # generating S
+# records.
+
+set low ""
+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\]+)\[ 	\]*vma\[ 	\]*(\[0-9a-fA-F\]+)(.*)"
+
+set got $headers
+while {[regexp $headers_regexp $got all name size vma rest]} {
+    set vma 0x$vma
+    if {$low == "" || $vma < $low} then {
+        set low $vma
+	set lowname $name
+    }
+    set got $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"]
+    if ![string match "" $got] 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\]+)"
+	if ![regexp $want $got all start vma] then {
+	    fail "objcopy --adjust-vma"
+	} else {
+	    set vma 0x$vma
+	    if {$vma != $low + 0x123} then {
+		fail "objcopy --adjust-vma ($vma != $low + 0x123)"
+	    } else {
+		if {$start != $origstart + 0x123} then {
+		    fail "objcopy --adjust-vma ($start != $origstart + 0x123)"
+		} else {
+		    pass "objcopy --adjust-vma"
+		}
+	    }
+	}
+    }
+
+    set arg ""
+    set got $headers
+    while {[regexp $headers_regexp $got all name size vma rest]} {
+	set vma 0x$vma
+	if {$vma == $low} then {
+	    set arg "$arg --adjust-section-vma $name+4"
+	}
+	set got $rest
+    }
+
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec $arg"]
+    if ![string match "" $got] then {
+	fail "objcopy --adjust-section-vma +"
+    } else {
+	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/copy.srec"]
+	set want "file format srec.*vma\[ 	\]*(\[0-9a-fA-F\]+)"
+	if ![regexp $want $got all vma] then {
+	    fail "objcopy --adjust-section-vma +"
+	} else {
+	    set vma 0x$vma
+	    if {$vma != $low + 4} then {
+		fail "objcopy --adjust-section-vma + ($vma != $low + 4)"
+	    } else {
+		pass "objcopy --adjust-section-vma +"
+	    }
+	}
+    }
+
+    regsub -all "\\+4" $arg "=[expr $low + 4]" argeq
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec tmpdir/bintest.o tmpdir/copy.srec $argeq"]
+    if ![string match "" $got] then {
+	fail "objcopy --adjust-section-vma ="
+    } else {
+	set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -h tmpdir/copy.srec"]
+	set want "file format srec.*vma\[ 	\]*(\[0-9a-fA-F\]+)"
+	if ![regexp $want $got all vma] then {
+	    fail "objcopy --adjust-section-vma ="
+	} else {
+	    set vma 0x$vma
+	    if {$vma != $low + 4} then {
+		fail "objcopy --adjust-section-vma = ($vma != $low + 4)"
+	    } else {
+		pass "objcopy --adjust-section-vma ="
+	    }
+	}
+    }
+}