Index: thread-specific-bp.exp
===================================================================
RCS file: thread-specific-bp.exp
diff -N thread-specific-bp.exp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ thread-specific-bp.exp	23 Aug 2013 04:54:46 -0000
@@ -0,0 +1,98 @@
+# Copyright (C) 2013 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 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, see <http://www.gnu.org/licenses/>.
+#
+# Verify that a thread-specific breakpoint is deleted when the
+# corresponding thread is gone.
+
+standard_testfile
+
+if {[gdb_compile_pthreads \
+	 "${srcdir}/${subdir}/${srcfile}" \
+	 "${binfile}" executable {debug} ] != "" } {
+    return -1
+}
+
+clean_restart ${binfile}
+
+proc check_threaded_breakpoint {mode} { with_test_prefix "$mode" {
+    
+    global gdb_prompt
+    gdb_breakpoint "start"
+    gdb_continue_to_breakpoint "start"
+    set thre 0
+    
+    gdb_test_multiple "info threads" "get thread 1 id" {
+	-re "(\[0-9\]+)(\[^\n\r\]*Thread\[^\n\r\]*start.*)($gdb_prompt $)" {
+	    pass "thread created"
+	    # get the id of thread
+	    set thre $expect_out(1,string)
+	}
+    }
+    gdb_breakpoint "main thread $thre"
+    gdb_test "info break" ".*breakpoint.*thread $thre" "Breakpoint set"
+    gdb_breakpoint [gdb_get_line_number "set break here"]
+    
+    # Force GDB to update its knowledge on existing threads when this
+    # breakpoint is hit.  Otherwise, GDB doesn't realize thread $thre
+    # has exited and doesn't remove the thread specific breakpoint.
+    gdb_test "commands\ninfo threads\nend" "End with.*" "add breakpoint commands"
+    gdb_test "thread $thre" "Switching to thread $thre.*" "Thread $thre selected"
+    set full_name "continue to breakpoint: set break here"
+    
+    send_gdb "continue\n"
+    gdb_expect 10 {
+	-re "(?:Breakpoint|Temporary breakpoint) .* (at|in) .*\r\n$gdb_prompt $" {
+	    pass $full_name
+	}
+	-re ".*$gdb_prompt $" {
+	    fail $full_name
+	}
+	timeout { 
+	    send_gdb "thread 1\n"
+	    exp_continue
+	}
+    }
+    
+    set test "thread-specific breakpoint is deleted"
+    gdb_test_multiple "info breakpoint" $test {
+    	-re "thread $thre.*$gdb_prompt $" {
+	    fail $test
+    	}
+    	-re "$gdb_prompt $" {
+	    pass $test
+    	}
+    }}
+}
+
+if ![runto_main] {
+    untested "could not run to main"
+    return -1
+}
+
+# Testing in all stop mode.
+check_threaded_breakpoint "All stop"
+
+clean_restart ${binfile}
+
+gdb_test "set target-async on" ".*" "Set async mode"
+gdb_test "set non-stop on" ".*" "Set non stop mode"
+
+if ![runto_main] {
+    untested "could not run to main"
+    return -1
+}
+
+# Testing in non-stop with async mode.
+check_threaded_breakpoint "non-stop with async"