Merge GDB 7.5.1

gdb/testsuite/gdb.go/types.exp

Index: gdb/testsuite/gdb.go/types.exp
diff --git a/gdb/testsuite/gdb.base/watchpoint-delete.exp b/gdb/testsuite/gdb.go/types.exp
similarity index 50%
copy from gdb/testsuite/gdb.base/watchpoint-delete.exp
copy to gdb/testsuite/gdb.go/types.exp
index 0c5deaad7a08969946d2dd44d57c660bc8b45def..da9d387b43002d09b07d86fa1ca417dc238f3dcd 100644
--- a/gdb/testsuite/gdb.base/watchpoint-delete.exp
+++ b/gdb/testsuite/gdb.go/types.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,36 @@
 # 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}
+# Various experiments with types.
+
+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"
-
-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 .*"
+# It's not clear yet what GCC will emit.
+# Pick something and xfail it until GCC solidifies.
+# And we still need to finish go-typeprint.c.
+
+setup_xfail "*-*-*"
+gdb_test "ptype T" "type T *T"
 
-gdb_test "watch x" {Watchpoint [0-9]+: x}
+setup_xfail "*-*-*"
+gdb_test "ptype T1" "type T1 *T2"
+setup_xfail "*-*-*"
+gdb_test "ptype T2" "type T2 *T1"
 
-gdb_test_no_output {delete $bpnum}
+setup_xfail "*-*-*"
+gdb_test "ptype S1" "type S1 struct {.*p_s2 *S2.*}"
+setup_xfail "*-*-*"
+gdb_test "ptype S2" "type S2 struct {.*p_s1 *S1.*}"