* binutils-all/objcopy.exp (copy_setup): Don't perror, use send_log.

	(copy_executable): Return early if test2 is blank.
	Return unsupported rather than unresolved if we can't run
	executables.  Do test1 if we can compile.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 7ec2cea..7b4a1fa 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-02  Alan Modra  <amodra@bigpond.net.au>
+
+       * binutils-all/objcopy.exp (copy_setup): Don't perror, use send_log.
+       (copy_executable): Return early if test2 is blank.
+       Return unsupported rather than unresolved if we can't run
+       executables.  Do test1 if we can compile.
+
 2007-04-24  Nathan Froyd  <froydnj@codesourcery.com>
            Phil Edwards  <phil@codesourcery.com>
 

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 0493d86..10cc86f 100644 (file)
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -516,7 +516,7 @@ proc copy_setup { } {
     set status [lindex $result 0]
 
     if { $status != "pass"  } {
-       perror "unresolved setup, status = $status"
+       send_log "cannot run executable, status = ${status}\n"
        return 3
     }
 
@@ -541,6 +541,9 @@ proc copy_executable { prog flags test1 test2 } {
 
     if ![string match "" $exec_output] {
        fail $test1
+       if [string match "" $test2] {
+           return
+       }
        fail $test2
        return
     }
@@ -582,6 +585,10 @@ proc copy_executable { prog flags test1 test2 } {
        fail $test1
     }
 
+    if [string match "" $test2] {
+       return
+    }
+
     set output [remote_load target tmpdir/copyprog]
     set status [lindex $output 0]
     if { $status != "pass" } {
@@ -693,10 +700,10 @@ switch [copy_setup] {
        untested $test4
     }
     "3" {
-       unresolved $test1
-       unresolved $test2
-       unresolved $test3
-       unresolved $test4
+       copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" ""
+       unsupported $test2
+       unsupported $test3
+       unsupported $test4
     }
     "0" {
        copy_executable "$OBJCOPY" "$OBJCOPYFLAGS" "$test1" "$test2"