Merge GDB 7.5.1

gdb/testsuite/gdb.linespec/linespec.exp

 # Copyright 2011-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
 # 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/>.
 
 # Tests of ambiguous linespecs.
 
-set testfile linespec
+standard_testfile lspec.cc
 
-set exefile lspec
-set binfile ${objdir}/${subdir}/${exefile}
+set exefile $testfile
 
 set baseone base/one/thefile.cc
 set basetwo base/two/thefile.cc
 
 if {[skip_cplus_tests]} {
     unsupported linespec.exp
     return
 }
 
 if {[prepare_for_testing ${testfile}.exp $exefile \
-         [list lspec.cc $baseone $basetwo] \
-         {debug nowarnings}]} {
+         [list $srcfile $baseone $basetwo] \
+         {debug nowarnings c++}]} {
     return -1
 }
 
 gdb_test_no_output "set multiple-symbols all" \
     "set multiple-symbols to all for linespec tests"
 
 set l1 [gdb_get_line_number "thefile breakpoint" $baseone]
 set l2 [gdb_get_line_number "thefile breakpoint" $basetwo]
 
 if {$l1 != $l2} {
     error "somebody incompatibly modified the source files needed by linespec.exp"
 }
 
+gdb_test "break one/thefile.cc:$l1" \
+    "Breakpoint $decimal at $hex: file .*thefile.cc, line $l1." \
+    "single-location break using dir/file:line"
+
+gdb_test "clear one/thefile.cc:$l1" \
+    "Deleted breakpoint $decimal *" \
+    "clear breakpoint using dir/file:line"
+
 gdb_test "break thefile.cc:$l1" \
-    "Breakpoint 1 at $hex: thefile.cc:$l1. \[(\]2 locations\[)\]" \
+    "Breakpoint $decimal at $hex: thefile.cc:$l1. \[(\]2 locations\[)\]" \
     "multi-location break using file:line"
 
-# We'd like this to work, but it currently does not.
-# gdb_test "break one/thefile.cc:$l1"
-
 gdb_test "break dupname" \
-    "Breakpoint 2 at $hex: dupname. \[(\]2 locations\[)\]" \
+    "Breakpoint $decimal at $hex: dupname. \[(\]2 locations\[)\]" \
     "multi-location break using duplicate function name"
 
 gdb_test "break dupname:label" \
-    "Breakpoint 3 at $hex: dupname:label. \[(\]2 locations\[)\]" \
+    "Breakpoint $decimal at $hex: dupname:label. \[(\]2 locations\[)\]" \
     "multi-location break using duplicate function name and label"
 
 gdb_test_no_output "set breakpoint pending off" \
     "disable pending breakpoints for linespec tests"
 
 # This is PR breakpoints/12856.
 gdb_test "break lspec.cc:nosuchfunction" \
     "Function \"nosuchfunction\" not defined in \"lspec.cc\"." \
     "set breakpoint on non-existent function"
 
@@ skipping 38 matching lines @@
 
 # Note that in particular this should not cause errors when re-setting
 # breakpoints.
 gdb_test "file $binfile" \
     "Reading symbols from .*done." \
     "set the new inferior file for linespec tests"
 
 gdb_test "break main" \
     "Breakpoint \[0-9\]+ at $hex: main. .2 locations." \
     "set breakpoint at main in both inferiors"