Fix readelf -S and readelf -s tests for MIPS and v850

[deliverable/binutils-gdb.git] / binutils / testsuite / binutils-all / ar.exp

diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
index b4f3013bdf1716dfa4d3c01ac29a0eb80ba6b32f..4b38c6b066e4362b65aa3251257ed3c15bf05cc1 100644 (file)
--- a/binutils/testsuite/binutils-all/ar.exp
+++ b/binutils/testsuite/binutils-all/ar.exp
@@ -19,9 +19,11 @@
 
 # Written by Ian Lance Taylor <ian@cygnus.com>
 
-if {[which $AR] == 0} then {
-    perror "$AR does not exist"
-    return
+if ![is_remote host] {
+    if {[which $AR] == 0} then {
+        perror "$AR does not exist"
+        return
+    }
 }
 
 # send_user "Version [binutil_version $AR]"
@@ -36,8 +38,13 @@ proc long_filenames { } {
 
     set n1 "abcdefghijklmnopqrstuvwxyz1"
     set n2 "abcdefghijklmnopqrstuvwxyz2"
+    set file1 tmpdir/$n1
+    set file2 tmpdir/$n2
+
+    remote_file build delete $file1
 
-    binutils_remove tmpdir/$n1
+    # Some file systems truncate file names at 14 characters, which
+    # makes it impossible to run this test.  Check for that now.
     set status [catch "set f [open tmpdir/$n1 w]" errs]
     if { $status != 0 } {
        verbose -log "open tmpdir/$n1 returned $errs"
@@ -47,7 +54,9 @@ proc long_filenames { } {
     puts $f "first"
     close $f
 
-    binutils_remove tmpdir/$n2
+
+    remote_file build delete $file2
+
     set status [catch "set f [open tmpdir/$n2 w]" errs]
     if { $status != 0 } {
        verbose -log "open tmpdir/$n2 returned $errs"
@@ -57,8 +66,21 @@ proc long_filenames { } {
     puts $f "second"
     close $f
 
-    # Some file systems truncate file names at 14 characters, which
-    # makes it impossible to run this test.  Check for that now.
+    if [is_remote host] {
+       set file1 [remote_download host $file1];
+       set file2 [remote_download host $file2];
+       set dest artest.a
+    } else {
+       set dest tmpdir/artest.a
+    }
+
+    remote_file host delete $dest;
+
+    set got [binutils_run $AR "rc $dest $file1 $file2"]
+    if [is_remote host] {
+       remote_upload host $file1 tmpdir/$n1
+    }
+
     set f [open tmpdir/$n1 r]
     gets $f string
     close $f
@@ -68,24 +90,31 @@ proc long_filenames { } {
        return
     }
 
-    binutils_remove tmpdir/artest.a
-    set got [binutils_run $AR "rc tmpdir/artest.a tmpdir/$n1 tmpdir/$n2"]
+    remote_file host delete $dest;
+    set got [binutils_run $AR "rc $dest $file1 $file2"]
+
     if ![string match "" $got] {
        fail $testname
        return
     }
 
-    binutils_remove tmpdir/$n1
-    binutils_remove tmpdir/$n2
+    remote_file build delete tmpdir/$n1
+    remote_file build delete tmpdir/$n2
 
-    set got [binutils_run $AR "t tmpdir/artest.a"]
+    set got [binutils_run $AR "t $dest"]
+    regsub "\[\r\n \t\]*$" "$got" "" got;
     if ![string match "$n1*$n2" $got] {
        fail $testname
        return
     }
+    
+    if [is_remote host] {
+       remote_file host delete $file1;
+       remote_file host delete $file2;
+    }
 
-    verbose -log "cd tmpdir; $AR x artest.a"
-    catch "exec /bin/sh -c \"cd tmpdir; $AR x artest.a\"" exec_output
+    verbose -log "$AR x $dest"
+    set exec_output [binutils_run $AR "x $dest"]
     set exec_output [prune_warnings $exec_output]
     if ![string match "" $exec_output] {
        verbose -log $exec_output
@@ -93,20 +122,30 @@ proc long_filenames { } {
        return
     }
 
-    if ![file exists tmpdir/$n1] {
-       verbose -log "tmpdir/$n1 does not exist"
+    if [is_remote host] {
+       remote_upload host $n1 tmpdir/$n1;
+       remote_upload host $n2 tmpdir/$n2;
+       set file1 tmpdir/$n1
+       set file2 tmpdir/$n2
+    } else {
+       set file1 $n1
+       set file2 $n2
+    }
+
+    if ![file exists $file1] {
+       verbose -log "$file1 does not exist"
        fail $testname
        return
     }
-    if ![file exists tmpdir/$n2] {
-       verbose -log "tmpdir/$n2 does not exist"
+    if ![file exists $file2] {
+       verbose -log "$file2 does not exist"
        fail $testname
        return
     }
 
-    set f [open tmpdir/$n1 r]
+    set f [open $file1 r]
     if { [gets $f line] == -1 || $line != "first" } {
-       verbose -log "tmpdir/$n1 contents:"
+       verbose -log "$file1 contents:"
        verbose -log "$line"
        close $f
        fail $testname
@@ -114,9 +153,9 @@ proc long_filenames { } {
     }
     close $f
 
-    set f [open tmpdir/$n2 r]
+    set f [open $file2 r]
     if { [gets $f line] == -1 || $line != "second" } {
-       verbose -log "tmpdir/$n2 contents:"
+       verbose -log "$file2 contents:"
        verbose -log "$line"
        close $f
        fail $testname
@@ -138,20 +177,29 @@ proc symbol_table { } {
 
     set testname "ar symbol table"
 
-    if ![binutils_assemble $AS $srcdir/$subdir/bintest.s tmpdir/bintest.o] {
+    if ![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o] {
        unresolved $testname
        return
     }
 
-    binutils_remove tmpdir/artest.a
+    if [is_remote host] {
+       set archive artest.a
+       set objfile [remote_download host tmpdir/bintest.o]
+       remote_file host delete $archive
+    } else {
+       set archive tmpdir/artest.a
+       set objfile tmpdir/bintest.o
+    }
+
+    remote_file build delete tmpdir/artest.a
 
-    set got [binutils_run $AR "rc tmpdir/artest.a tmpdir/bintest.o"]
+    set got [binutils_run $AR "rc $archive ${objfile}"]
     if ![string match "" $got] {
        fail $testname
        return
     }
 
-    set got [binutils_run $NM "--print-armap tmpdir/artest.a"]
+    set got [binutils_run $NM "--print-armap $archive"]
     if { ![string match "*text_symbol in bintest.o*" $got] \
         || ![string match "*data_symbol in bintest.o*" $got] \
         || ![string match "*common_symbol in bintest.o*" $got] \