Index: lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.231
diff -u -r1.231 gdb.exp
--- lib/gdb.exp	6 May 2013 22:11:15 -0000	1.231
+++ lib/gdb.exp	30 May 2013 23:17:23 -0000
@@ -1403,6 +1403,7 @@
     global gdb_prompt
     global timeout
     global gdb_spawn_id;
+    global gdb_remotetimeout
 
     gdb_stop_suppressing_tests;
 
@@ -1447,6 +1448,12 @@
 	}
     }
     set gdb_spawn_id -1;
+
+    # Reset remotetimeout if needed.
+    if [info exists gdb_remotetimeout] {
+	set_remotetimeout $gdb_remotetimeout
+    }
+
     # force the height to "unlimited", so no pagers get used
 
     send_gdb "set height 0\n"
Index: boards/remote-stdio-gdbserver.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/boards/remote-stdio-gdbserver.exp,v
retrieving revision 1.1
diff -u -r1.1 remote-stdio-gdbserver.exp
--- boards/remote-stdio-gdbserver.exp	21 May 2013 17:58:46 -0000	1.1
+++ boards/remote-stdio-gdbserver.exp	30 May 2013 23:17:23 -0000
@@ -26,6 +26,9 @@
 
 load_board_description "native-stdio-gdbserver"
 
+global gdb_remotetimeout
+set gdb_remotetimeout 60
+
 set_board_info rsh_prog /usr/bin/ssh
 set_board_info rcp_prog /usr/bin/scp