aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2003-06-19 07:45:50 +0000
committerNick Clifton <nickc@redhat.com>2003-06-19 07:45:50 +0000
commitf8a7038a5f3e6067fb696d1a7dc1b71d95abd26d (patch)
tree1334a28b14a1d9fb169d8c71ba08ed339b011aba /binutils
parent7be04a682f4b6dfc571123ab1692543221ab3c87 (diff)
downloadgdb-f8a7038a5f3e6067fb696d1a7dc1b71d95abd26d.zip
gdb-f8a7038a5f3e6067fb696d1a7dc1b71d95abd26d.tar.gz
gdb-f8a7038a5f3e6067fb696d1a7dc1b71d95abd26d.tar.bz2
Replace occurances of testprog with $test_prog. Initialise this variable to
testprog.exe on Cygwin targeted systems.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/testsuite/ChangeLog6
-rw-r--r--binutils/testsuite/binutils-all/objcopy.exp18
2 files changed, 19 insertions, 5 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index c1a2399..23eaaf7 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-19 Nick Clifton <nickc@redhat.com>
+
+ * binutils-all/objcopy.exp: Replace occurances of testprog with
+ $test_prog. Initialise this variable to testprog.exe on Cygwin
+ targeted systems.
+
2003-04-26 Nick Clifton <nickc@redhat.com>
* binutils-all/readelf.exp (prune_read_warnings): Rename to
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 5d4a1bb..795c1b7 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -425,10 +425,17 @@ strip_test_with_saving_a_symbol
# Build a final executable.
+if { [istarget *-*-cygwin] } {
+ set test_prog "testprog.exe"
+} else {
+ set test_prog "testprog"
+}
+
proc copy_setup { } {
global srcdir
global subdir
global gcc_gas_flag
+ global test_prog
set res [build_wrapper testglue.o];
set flags { debug };
@@ -445,11 +452,11 @@ proc copy_setup { } {
set flags "additional_flags=$i $flags"
}
}
- if { [target_compile "$srcdir/$subdir/testprog.c $add_libs" tmpdir/testprog executable $flags] != "" } {
+ if { [target_compile "$srcdir/$subdir/testprog.c $add_libs" tmpdir/$test_prog executable $flags] != "" } {
return 2
}
- set result [remote_load target tmpdir/testprog];
+ set result [remote_load target tmpdir/$test_prog];
set status [lindex $result 0];
if { $status != "pass" } {
@@ -463,12 +470,13 @@ proc copy_setup { } {
# Test copying an executable.
proc copy_executable { prog flags test1 test2 } {
+ global test_prog
if [is_remote host] {
- set testfile [remote_download host tmpdir/testprog];
+ set testfile [remote_download host tmpdir/$test_prog];
set testcopy copyprog
} else {
- set testfile tmpdir/testprog
+ set testfile tmpdir/$test_prog
set testcopy tmpdir/copyprog
}
remote_file host delete $testcopy;
@@ -485,7 +493,7 @@ proc copy_executable { prog flags test1 test2 } {
remote_upload host $testcopy tmpdir/copyprog
}
- set status [remote_exec build "cmp" "tmpdir/testprog tmpdir/copyprog"]
+ set status [remote_exec build "cmp" "tmpdir/$test_prog tmpdir/copyprog"]
set exec_output [lindex $status 1];
if [string match "" $exec_output] then {