Merge GDB 7.5.1

gdb/testsuite/gdb.linespec/thread.exp

Index: gdb/testsuite/gdb.linespec/thread.exp
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.linespec/thread.exp
similarity index 52%
copy from gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
copy to gdb/testsuite/gdb.linespec/thread.exp
index 1c1f972e7d5d1e80fe42a8a532d0ec295a161336..1e8ee465a35b02d7f9059ba716a17d3f75ba2ff9 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
+++ b/gdb/testsuite/gdb.linespec/thread.exp
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Free Software Foundation, Inc.
+# Copyright 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
@@ -13,27 +13,29 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if {[skip_hw_watchpoint_access_tests]} {
-    return 0
-}
+# http://sourceware.org/bugzilla/show_bug.cgi?id=14643
+# gdb 7.5 thinks "thread" is a linespec keyword.
+
+standard_testfile
+set exefile $testfile
 
-set test watchpoint-hw-hit-once
-set srcfile ${test}.c
-if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } {
+if {[prepare_for_testing $testfile $exefile $srcfile {debug}]} {
     return -1
 }
 
 if ![runto_main] {
-    return -1
+    fail "Can't run to main"
+    return 0
 }
 
-gdb_test "rwatch watchee"
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+
+gdb_test "break $srcfile:$bp_location1" \
+    "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
+    "breakpoint line number in file"
 
-gdb_breakpoint [gdb_get_line_number "break-at-exit"]
+gdb_continue_to_breakpoint "$bp_location1"
 
-gdb_test "continue" "Continuing.\r\nHardware read watchpoint \[0-9\]+: watchee\r\n\r\nValue = 0\r\n.*"
+gdb_breakpoint "thread" "message"
 
-# Here should be no repeated notification of the read watchpoint.
-gdb_test "continue" \
-	 "Continuing\\.\[ \r\n\]+Breakpoint \[0-9\]+, .*break-at-exit.*" \
-	 "continue to break-at-exit"
+gdb_continue_to_breakpoint "thread function"