gdb: remove uses of iterate_over_inferiors in mi/mi-main.c

[deliverable/binutils-gdb.git] / gdb / testsuite / config / sim.exp

diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp
index 9b6a226e044ad0fe0d24bb0c92e643614d19e4e3..df8e9d7490435aa8db3b18842b62fca8b04ca586 100644 (file)
--- a/gdb/testsuite/config/sim.exp
+++ b/gdb/testsuite/config/sim.exp
@@ -1,21 +1,18 @@
 # Test Framework Driver for GDB driving a builtin simulator
-#   Copyright 1994, 1997, 1998, 2004, 2007 Free Software Foundation, Inc.
+#   Copyright 1994-2020 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.  
-
-load_lib gdb.exp
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #
 # gdb_target_sim
@@ -23,25 +20,20 @@ load_lib gdb.exp
 #
 proc gdb_target_sim { } {
     global gdb_prompt
-    global exit_status
     
-    set target_sim_options "[board_info target gdb,target_sim_options]";
+    set target_sim_options "[board_info target gdb,target_sim_options]"
 
     send_gdb "target sim $target_sim_options\n"
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
+    gdb_expect 60 {
        -re "Connected to the simulator.*$gdb_prompt $" {
            verbose "Set target to sim"
        }
        timeout { 
            perror "Couldn't set target for simulator."
-           cleanup
-           exit $exit_status
+           return -1
        }
     }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
+    return 0
 }
 
 #
@@ -59,18 +51,14 @@ proc gdb_load { arg } {
        if [gdb_file_cmd $arg] then { return -1 }
     }
 
-    gdb_target_sim
+    if [gdb_target_sim] then { return -1 }
 
     send_gdb "load\n"
-    set timeout 2400
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
+    gdb_expect 2400 {
        -re ".*$gdb_prompt $" {
            if $verbose>1 then {
                send_user "Loaded $arg into $GDB\n"
            }
-           set timeout 30
-           verbose "Timeout is now $timeout seconds" 2
            return 0
        }
        -re "$gdb_prompt $"     {