Merge GDB 7.5.1

gdb/testsuite/gdb.go/handcall.exp

Index: gdb/testsuite/gdb.go/handcall.exp
diff --git a/gdb/testsuite/gdb.base/watchpoint-delete.exp b/gdb/testsuite/gdb.go/handcall.exp
similarity index 55%
copy from gdb/testsuite/gdb.base/watchpoint-delete.exp
copy to gdb/testsuite/gdb.go/handcall.exp
index 0c5deaad7a08969946d2dd44d57c660bc8b45def..7dd6d6eb9191464ba141619964d59b7140164d79 100644
--- a/gdb/testsuite/gdb.base/watchpoint-delete.exp
+++ b/gdb/testsuite/gdb.go/handcall.exp
@@ -1,5 +1,7 @@
-# Copyright 2010-2012 Free Software Foundation, Inc.
+# This testcase is part of GDB, the GNU debugger.
 
+# 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
 # the Free Software Foundation; either version 3 of the License, or
@@ -13,26 +15,30 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "watchpoint-delete"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+# Test hand-calling go functions.
+
+load_lib "go.exp"
+
+if { [skip_go_tests] } { continue }
 
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
-    untested ${testfile}.exp
+standard_testfile .go
+
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } {
     return -1
 }
 
-# It is more compatible this way.
-gdb_test_no_output "set can-use-hw-watchpoints 0"
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 
-if ![runto_main] {
+if { [go_runto_main] < 0 } {
+    untested $testfile
     return -1
 }
 
-# Ensure there is a parent frame to create related bp_watchpoint_scope.
-gdb_breakpoint [gdb_get_line_number "break-here"]
-gdb_continue_to_breakpoint "break-here" ".* break-here .*"
+if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {
+    pass "setting breakpoint 1"
+}
 
-gdb_test "watch x" {Watchpoint [0-9]+: x}
+gdb_test "cont" "Breakpoint .*:${bp_location1}.*" "Going to first breakpoint"
 
-gdb_test_no_output {delete $bpnum}
+gdb_test "print add (1, 2)" " = 3"
+gdb_test "print main.add (1, 2)" " = 3"