Switch the license of all .exp files to GPLv3.

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

diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index e48d0d94461c035dbf94e91cca6a198da75660ab..35c4ad96cbf9be4281475ba68da78e982b8218f7 100644 (file)
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -1,20 +1,19 @@
 # Test Framework Driver for GDB driving a ROM monitor (via monitor.c).
-#   Copyright 1995, 1996, 1997, 1998, 1999, 2000
+#   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2007
 #   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
 # puts "***** DID USE MONITOR ******"
@@ -221,8 +220,14 @@ proc gdb_load { arg } {
            } else {
                set command "load $farg\n";
            }
+           if [target_info exists gdb_load_timeout] {
+               set loadtimeout [target_info gdb_load_timeout]
+           } else {
+               set loadtimeout 1600
+           }
+
            send_gdb $command;
-           gdb_expect 1600 {
+           gdb_expect $loadtimeout {
                -re "\[Ff\]ailed.*$gdb_prompt $" {
                    verbose "load failed";
                }