This commit was manufactured by cvs2svn to create branch 'gdb_7_0-branch'.

[external/binutils.git] / gdb / testsuite / config / sid.exp

diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
index 7a73162..b48fc76 100644 (file)
--- a/gdb/testsuite/config/sid.exp
+++ b/gdb/testsuite/config/sid.exp
@@ -1,19 +1,18 @@
 # Test Framework Driver for GDB driving an external simulator
-#   Copyright 1999, 2001 Free Software Foundation, Inc.
+#   Copyright 1999, 2001, 2007, 2008, 2009 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
+# the Free Software Foundation; either version 3 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 load_lib gdb.exp
 
@@ -30,13 +29,16 @@ proc sid_start {} {
            if {[target_info exists sim,defaultendian]} then {
                set sidendian [target_info sim,defaultendian] 
            } else { 
-               warning "Unknown target endianness - assuming -EB"
-               set sidendian "-EB" 
+                # rely on endianness settings in sid configuration defaults
+                set sidendian ""
            }
        }
     }
-    # set verbosity conditionally
-    if {$verbose > 0} then { set sidverbose "--verbose" } else { set sidverbose "" }
+    case $sidendian in {
+       { -EB } { set sidendian2 {-e "set cpu endian big"} }
+       { -EL } { set sidendian2 {-e "set cpu endian little"} }
+       default { set sidendian2 {} }
+    }
 
     # test to see whether to use use sid in build or install tree
     set use_build_tree [file exists ../../sid]
@@ -46,30 +48,30 @@ proc sid_start {} {
            global env
            set env(SID_LIBRARY_PATH) [join [glob "../../sid/component/*"] ":"]
            set env(SID) "../../sid/main/dynamic/sid"
-           set env(MKSID) "../../sid/main/static/mksid"
            if {! [file exists $env(SID)]} then { error "Cannot find sid in build tree" }
        }
        if { [board_info target sim,protocol] == "sid" } {
-           set spawncmd "[target_info sim] [target_info sim,options] -e \"set gdb-socket sockaddr-local 0.0.0.0:$port\""
+           set spawncmd "[target_info sim] [target_info sim,options] $sidendian2 -e \"set cpu-gdb-socket sockaddr-local 0.0.0.0:$port\""
+       } elseif { [board_info target sim,protocol] == "rawsid" } {
+           set spawncmd "[target_info sim] [target_info sim,options] -$sidendian --gdb=$port"
        } else {
-           set spawncmd "../../sid/bsp/[target_info sim] $sidverbose $sidendian --gdb=$port [target_info sim,options]"
+           set spawncmd "../../sid/bsp/[target_info sim] $sidendian --gdb=$port [target_info sim,options]"
        }
        set post_spawn {
            global env
            unset env(SID_LIBRARY_PATH)
-           unset env(MKSID)
            unset env(SID)
        }
     } else {
-       global find_rawsid;
-
        set pre_spawn {}
        if { [board_info target sim,protocol] == "sid" } {
            # FIXME: sim,options may be from the build tree, should find
            # it in the install tree.
-           set spawncmd "sid [target_info sim,options] -e \"set gdb-socket sockaddr-local 0.0.0.0:$port\""
+           set spawncmd "sid [target_info sim,options] $sidendian2 -e \"set cpu-gdb-socket sockaddr-local 0.0.0.0:$port\""
+       } elseif { [board_info target sim,protocol] == "rawsid" } {
+           set spawncmd "[target_info sim] [target_info sim,options] -$sidendian --gdb=$port"
        } else {
-           set spawncmd "[target_info sim] $sidverbose $sidendian --gdb=$port [target_info sim,options]"
+           set spawncmd "[target_info sim] $sidendian --gdb=$port [target_info sim,options]"
        }
        set post_spawn {}
     }
@@ -81,12 +83,13 @@ proc sid_start {} {
     }
     eval $post_spawn
 
-    expect_background {
-       -re \[^\n\]*\n { 
-           regsub "\n" $expect_out(buffer) {} msg
-           verbose "SID: $msg" 2
-       }
-    }
+    # Don't do the following any more; it breaks with "runtest ... < /dev/null"
+#    expect_background {
+#      -re \[^\n\]*\n { 
+#          regsub "\n" $expect_out(buffer) {} msg
+#          verbose "SID: $msg" 2
+#      }
+#    }
 
     # There should be no need to sleep to give SID time to start;
     # GDB would wait for a fair while for the stub to respond.
@@ -171,8 +174,10 @@ proc gdb_load { arg } {
     global gdb_prompt
     global retval
 
-    gdb_unload
-    if [gdb_file_cmd $arg] then { return -1 }
+    if { $arg != "" } {
+       if [gdb_file_cmd $arg] then { return -1 }
+    }
+
     gdb_target_sid
 
     send_gdb "load\n"
@@ -191,7 +196,7 @@ proc gdb_load { arg } {
            if $verbose>1 then {
                send_user "Loaded $arg into $GDB\n"
            }
-           set retval 1;
+           set retval 0;
        }
        -re "$gdb_prompt $"     {
            if $verbose>1 then {