X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.threads%2Fprint-threads.exp;h=4589d522ebcc1911cf257981adfbfd6d45ab0cdd;hb=12b5d08a7553953ab0c089fed79ff3c2e8389457;hp=b4404abf90e6e5f020b698614540ab25e805980b;hpb=c7b778ff85b50c3ae10c924ad963b9484845a0ea;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index b4404abf90..4589d522eb 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 2002, 2003, 2007, 2008
+# Copyright (C) 1996, 1997, 2002, 2003, 2007, 2008, 2009, 2010
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -24,8 +24,6 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
-set prms_id 0
-set bug_id 0
 
 set testfile "print-threads"
 set srcfile ${testfile}.c
@@ -48,9 +46,9 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
-gdb_test "set print sevenbit-strings" ""
-#gdb_test "set print address off" ""
-gdb_test "set width 0" ""
+gdb_test_no_output "set print sevenbit-strings"
+#gdb_test_no_output "set print address off"
+gdb_test_no_output "set width 0"
 
 # We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
 # run the program and gdb starts saving and restoring tty states.
@@ -65,8 +63,7 @@ proc test_all_threads { name kill } {
 
     set i 0
     set j 0
-    send_gdb "continue\n"
-    gdb_expect {
+    gdb_test_multiple "continue" "all threads ran once" {
 	-re "Breakpoint \[0-9\]+, thread_function \\(arg=.*\\) at .*print-threads.c:\[0-9\]+.*$gdb_prompt" {
 	    set i [expr $i + 1]
 	    pass "Hit thread_function breakpoint, $i ($name)"
@@ -98,28 +95,22 @@ proc test_all_threads { name kill } {
 		fail "Running threads ($name) (unknown output)"
 	    }
 	}
-	-re "$gdb_prompt" {
-	    fail "Running threads ($name) (unknown output)"
-	}
-	timeout {
-	    fail "Running threads ($name) (timeout)"
-	}
     }
 }
 
 runto_main
 gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\."
-gdb_test "set var slow = 0" ""
+gdb_test_no_output "set var slow = 0"
 test_all_threads "fast" 0
 
 runto_main
 gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (2)"
-gdb_test "set var slow = 1" ""
+gdb_test_no_output "set var slow = 1"
 test_all_threads "slow" 0
 
 runto_main
 gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (3)"
-gdb_test "set var slow = 1" "" "set var slow = 1 (2)"
+gdb_test_no_output "set var slow = 1" "set var slow = 1 (2)"
 gdb_breakpoint "kill"
 test_all_threads "slow with kill breakpoint" 1