This commit was manufactured by cvs2svn to create branch 'gdb_7_2-branch'.

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.threads / staticthreads.exp

diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index 53ceaa06fa6974f0b699cec81e2497235c70c5f7..67f43f883ea420cd85129d8e96bd93fcd06be109 100644 (file)
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -1,20 +1,19 @@
 # static.exp -- test script, for GDB, the GNU debugger.
 
-# Copyright 2004, 2005 Free Software Foundation, Inc.
+# Copyright 2004, 2005, 2007, 2008, 2009, 2010 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/>.
 
 # Based on manythreads written by Jeff Johnston, contributed by Red
 # Hat.
@@ -23,8 +22,6 @@ if $tracelevel then {
        strace $tracelevel
 }
 
-set prms_id 0
-set bug_id 0
 
 set testfile "staticthreads"
 set srcfile ${testfile}.c
@@ -41,7 +38,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
-gdb_test "set print sevenbit-strings" ""
+gdb_test_no_output "set print sevenbit-strings"
 
 
 # See if the static multi-threaded program runs.
@@ -50,7 +47,7 @@ runto_main
 gdb_test "break sem_post"
 set test "Continue to main's call of sem_post"
 gdb_test_multiple "continue" "$test" {
-    -re " sem_post .*$gdb_prompt " {
+    -re "Breakpoint .*, .*sem_post .*$gdb_prompt " {
        pass "$test"
     }
     -re "Program received signal .*$gdb_prompt " {
@@ -92,7 +89,7 @@ gdb_test_multiple "info threads" "$test" {
 
 set test "GDB exits with static thread program"
 gdb_test_multiple "quit" "$test" {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
+    -re "Quit anyway\\? \\(y or n\\) $" {
        send_gdb "y\n"
        exp_continue
     }