Increase simulate-thread timeout (PR target/51753)

	PR target/51753
	* lib/gcc-simulate-thread.exp: Load timeout.exp.
	(simulate-thread): Use default timeout.

From-SVN: r184330

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2f5544b..7c50815 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       PR target/51753
+       * lib/gcc-simulate-thread.exp: Load timeout.exp.
+       (simulate-thread): Use default timeout.
+
 2012-02-16  Jason Merrill  <jason@redhat.com>
 
        PR c++/52248

diff --git a/gcc/testsuite/lib/gcc-simulate-thread.exp b/gcc/testsuite/lib/gcc-simulate-thread.exp
index 2b1294c..0b36947 100644 (file)
--- a/gcc/testsuite/lib/gcc-simulate-thread.exp
+++ b/gcc/testsuite/lib/gcc-simulate-thread.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 2011 Free Software Foundation, Inc.
+#   Copyright (C) 2011, 2012 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
@@ -14,6 +14,8 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
+load_lib timeout.exp
+
 # Utility for running a given test through the simulate-thread harness
 # using gdb.  This is invoked via dg-final.
 #
@@ -56,8 +58,7 @@ proc simulate-thread { args } {
 
     set gdb_worked 0
 
-    # Set timeout to 20 seconds due to huge amount of generated log.
-    remote_expect target 20 {
+    remote_expect target [timeout_value] {
        # Too old GDB
        -re "Unhandled dwarf expression|Error in sourced command file" {
            unsupported "$testcase $message"