4 files changed, 15 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 58b71d1..e517587 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-08  Andrew MacLeod  <amacleod@redhat.com>
+
+	* gcc.dg/simulate-thread/simulate-thread.exp: Use -O0, -O2, and -O3.
+	* gcc.dg/simulate-thread/simulate-thread.gdb: Don't display every 
+	machine instuction in the log.
+
+2012-02-08  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	* lib/gcc-simulate-thread.exp (simulate-thread): Increase timeout
+	  to 20 seconds.
+
 2012-02-08  Magnus Granberg  <zorry@gentoo.org>
 
 	PR driver/48524
diff --git a/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.exp b/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.exp
index 6d47388..cf1123a 100644
--- a/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.exp
+++ b/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.exp
@@ -24,10 +24,8 @@ dg-init
 torture-init
 set-torture-options [list \
 	{ -O0 -g } \
-	{ -O1 -g } \
 	{ -O2 -g } \
-	{ -O3 -g } \
-	{ -Os -g } ]
+	{ -O3 -g } ]
 
 if [gdb-exists] {
   gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] ""
diff --git a/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.gdb b/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.gdb
index c7bac73..cbb65db 100644
--- a/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.gdb
+++ b/gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.gdb
@@ -1,6 +1,6 @@
 set height 0
 break simulate_thread_main
-disp/i $pc
+# disp/i $pc
 run
 
 set $ret = 0
diff --git a/gcc/testsuite/lib/gcc-simulate-thread.exp b/gcc/testsuite/lib/gcc-simulate-thread.exp
index 9be5da3..2b1294c 100644
--- a/gcc/testsuite/lib/gcc-simulate-thread.exp
+++ b/gcc/testsuite/lib/gcc-simulate-thread.exp
@@ -56,8 +56,8 @@ proc simulate-thread { args } {
 
     set gdb_worked 0
 
-    # Set timeout to 10 seconds due to huge amount of generated log.
-    remote_expect target 10 {
+    # Set timeout to 20 seconds due to huge amount of generated log.
+    remote_expect target 20 {
 	# Too old GDB
 	-re "Unhandled dwarf expression|Error in sourced command file" {
 	    unsupported "$testcase $message"