* gdb.base/call-strs.exp, gdb.base/default.exp,

	gdb.base/ending-run.exp, gdb.base/finish.exp, gdb.base/funcargs.exp,
	gdb.base/huge.exp, gdb.base/nodebug.exp, gdb.base/ptype.exp,
	gdb.base/restore.exp, gdb.base/return.exp, gdb.base/setvar.exp,
	gdb.base/watchpoints.exp, gdb.threads/gcore-thread.exp,
	gdb.base/watchpoint-solib.exp: Save and restore timeout.
	* gdb.base/ending-run.exp: Correct restore of timeout.
	* gdb.base/page.exp: Remove unnecessary timeout setting.

17 files changed, 55 insertions, 18 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d92ded29722..d499ad71dd4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-29  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/call-strs.exp, gdb.base/default.exp,
+	gdb.base/ending-run.exp, gdb.base/finish.exp, gdb.base/funcargs.exp,
+	gdb.base/huge.exp, gdb.base/nodebug.exp, gdb.base/ptype.exp,
+	gdb.base/restore.exp, gdb.base/return.exp, gdb.base/setvar.exp,
+	gdb.base/watchpoints.exp, gdb.threads/gcore-thread.exp,
+	gdb.base/watchpoint-solib.exp: Save and restore timeout.
+	* gdb.base/ending-run.exp: Correct restore of timeout.
+	* gdb.base/page.exp: Remove unnecessary timeout setting.
+
 2010-01-29  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/rec_return: New testcase.
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index 1918ffee997..e03b881a22a 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -95,13 +95,14 @@ send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
 send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
 send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
 
-set timeout 120
-
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
     continue
 }
 
+set prev_timeout $timeout
+set timeout 120
+
 #step
 send_gdb "step\n"
 gdb_expect {
@@ -263,4 +264,6 @@ if ![gdb_skip_stdio_test "call str_func(s,s,s,s,s,s,s,s)"] {
 }
 
 gdb_exit
-return 0
+
+set timeout $prev_timeout
+
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index ab7a8466318..9603fd4ae0a 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -20,6 +20,7 @@
 gdb_exit
 gdb_start
 
+set prev_timeout $timeout
 set timeout 60
 
 #
@@ -801,3 +802,5 @@ gdb_test "where" "No stack." "where"
 gdb_test "x" "Argument required .starting display address.*" "x"
 
 gdb_exit
+
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index bfe550d8c21..7086c5d60a0 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -261,8 +261,6 @@ if {! [target_info exists use_gdb_stub]
 	unsupported "continue after exit"
     }
 
-    set timeout $old_timeout
-
     if {$program_exited_normally} {
         gdb_test "n" ".*The program is not being run.*" "don't step after run"
     } elseif {$program_not_exited} {
@@ -285,6 +283,8 @@ if {! [target_info exists use_gdb_stub]
     }
 }
 
+set timeout $old_timeout
+
 #remote_exec build "rm -f ${binfile}"
 return 0
 
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index 63f676880dc..29eaf9155b3 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -124,5 +124,7 @@ proc finish_tests { } {
     finish_abbreviation "fin"
 }
 
+set prev_timeout $timeout
 set timeout 30
 finish_tests
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp
index 9685d638796..3b46887f9ff 100644
--- a/gdb/testsuite/gdb.base/freebpcmd.exp
+++ b/gdb/testsuite/gdb.base/freebpcmd.exp
@@ -108,6 +108,7 @@ if {$i >= [llength $lines]} {
 
 gdb_run_cmd
 
+set prev_timeout $timeout
 set timeout 120
 
 gdb_test_multiple "" "run program with breakpoint commands" {
@@ -121,3 +122,5 @@ gdb_test_multiple "" "run program with breakpoint commands" {
         kfail "gdb/1489" "run program with breakpoint commands (GDB died)"
     }
 }
+
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index 3b3935ecbf4..4f0f25f5d9a 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -1149,6 +1149,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
+set prev_timeout $timeout
 if [istarget "mips*tx39-*"] {
     set timeout 300
 } else {
@@ -1223,3 +1224,5 @@ funcargs_reload
 localvars_in_indirect_call
 funcargs_reload
 test_stepping_over_trampolines
+
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index ed4d204c7a9..2e903b6858a 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -50,6 +50,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
+set prev_timeout $timeout
 set timeout 30
 
 if { ! [ runto_main ] } then {
@@ -59,3 +60,4 @@ if { ! [ runto_main ] } then {
 
 gdb_test "print a" ".1 = .0 .repeats \[0123456789\]+ times.." "print a very large data object"
 
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
index 331834bc31a..4666316891d 100644
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ b/gdb/testsuite/gdb.base/nodebug.exp
@@ -202,8 +202,10 @@ if [runto inner] then {
 	} else {
 	    # We need to up this because this can be really slow on some boards.
 	    # (malloc() is called as part of the test).
-	    set timeout 60;    
+	    set prev_timeout $timeout
+	    set timeout 60
 	    gdb_test {p/c array_index("abcdef",2)} " = 99 'c'"
+	    set timeout $prev_timeout
 	}
     }
     
diff --git a/gdb/testsuite/gdb.base/page.exp b/gdb/testsuite/gdb.base/page.exp
index 4070bb2fccc..2ea940b9b16 100644
--- a/gdb/testsuite/gdb.base/page.exp
+++ b/gdb/testsuite/gdb.base/page.exp
@@ -20,11 +20,6 @@ if $tracelevel {
     strace $tracelevel
 }
 
-global message
-global timeout
-
-set timeout 200
-
 gdb_exit
 gdb_start
 
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index 94c2348193d..43e646d0ead 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -626,7 +626,8 @@ if [runto_main] then {
 
   # We need to up this because this can be really slow on some boards.
   # (malloc() is called as part of the test).
-  set timeout 60;
+  set prev_timeout $timeout
+  set timeout 60
 
   gdb_test "ptype \"abc\""	"type = char \\\[4\\\]"
   gdb_test "ptype {'a','b','c'}"	"type = char \\\[3\\\]"
@@ -637,6 +638,8 @@ if [runto_main] then {
   gdb_test "ptype {4,5,6}\[2\]"	"type = int"
   gdb_test "ptype *&{4,5,6}\[1\]"	"Attempt to take address of value not located in memory."
 
+  set timeout $prev_timeout
+
   # Test ptype of user register
   gdb_test "ptype \$pc" "void \\(\\*\\)\\(\\)" "ptype \$pc"
 }
diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp
index f7ab949e303..38625999a62 100644
--- a/gdb/testsuite/gdb.base/restore.exp
+++ b/gdb/testsuite/gdb.base/restore.exp
@@ -116,5 +116,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
+set prev_timeout $timeout
 set timeout 30
 restore_tests
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp
index e0351ba31fe..66c8287f6fe 100644
--- a/gdb/testsuite/gdb.base/return.exp
+++ b/gdb/testsuite/gdb.base/return.exp
@@ -91,5 +91,7 @@ proc return_tests { } {
     gdb_test "p tmp3" ".* = 5.*" "correct value returned double test (known problem with sparc solaris)"
 }
 
+set prev_timeout $timeout
 set timeout 30
 return_tests
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
index 9750fc459e5..e79a734dcc9 100644
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ b/gdb/testsuite/gdb.base/setvar.exp
@@ -374,7 +374,8 @@ v_long_member = 3,.*v_float_member = 4,.*v_double_member = 5.*\}" \
 
 # We need to up this because this can be really slow on some boards.
 # (malloc() is called as part of the test).
-set timeout 60;
+set prev_timeout $timeout
+set timeout 60
 
 # Change the values
 test_set "set variable v_struct1 = {32, 33, 34, 35, 36, 37}" \
@@ -392,6 +393,8 @@ test_set "set variable v_struct1 = {'h', 1, 2, 3, 4.0, 5.0}" \
 v_long_member = 3,.*v_float_member = 4,.*v_double_member = 5.*\\}" \
   "set print structure #3"
 
+set timeout $prev_timeout
+
 # Test printing of enumeration bitfields.
 # GNU C supports them, some other compilers don't.
 
diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp
index 26c0aae9c2c..eb093cd03b2 100644
--- a/gdb/testsuite/gdb.base/watchpoint-solib.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp
@@ -83,6 +83,9 @@ gdb_test_multiple "break foo" "set pending breakpoint" {
      }
 }
 
+set prev_timeout $timeout
+set timeout 120
+
 gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo"
 gdb_test "watch g" "atchpoint 3: g" "set watchpoint on g"
 gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit"
@@ -90,7 +93,4 @@ rerun_to_main
 gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo again"
 gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit again"
 
-
-
-
-
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index 257a05bc224..757d93d1eef 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -53,6 +53,7 @@ gdb_load $binfile
     gdb_test "watch ival1" "" ""
     gdb_test "watch ival3" "" ""
 
+    set prev_timeout $timeout
     set timeout 600
 
     gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival1.*Old value = -1.*New value = 0.*ival1 = count; ival2 = count;.*" "watchpoint hit, first time"
@@ -102,4 +103,4 @@ gdb_load $binfile
     # Check that the hit count is reported correctly
     gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "Watchpoint hit count is 5"
 
-   
+set timeout $prev_timeout
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index 5ecfd0c181b..24faba73435 100644
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -55,6 +55,7 @@ set horiz "\[^\n\r\]*"
 # regexp for newline
 set nl "\[\r\n\]+"
 
+set prev_timeout $timeout
 set timeout 30
 
 send_gdb "help gcore\n"
@@ -174,3 +175,4 @@ gdb_test "info threads" ".* thread2 .*" \
 gdb_test "info threads" ".*${nl}\\* ${horiz} thread2 .*" \
 	"thread2 is current thread in corefile"
 
+set timeout $prev_timeout