* gdb.cp/method2.cc: New test.

* gdb.cp/method2.exp: New test.
	* gdb.cp/Makefile.in (EXECUTABLES): Add method2.

gdb/testsuite/ChangeLog

@@ -1,3 +1,9 @@
+2007-03-28  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* gdb.cp/method2.cc: New test.
+	* gdb.cp/method2.exp: New test.
+	* gdb.cp/Makefile.in (EXECUTABLES): Add method2.
+
 2007-03-27  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.ada/exec_changed.exp: Avoid "set confirm off".

gdb/testsuite/gdb.cp/Makefile.in

@@ -4,7 +4,7 @@ srcdir = @srcdir@
 EXECUTABLES = ambiguous annota2 anon-union cplusfuncs cttiadd \
 	derivation inherit local member-ptr method misc \
         overload ovldbreak ref-typ ref-typ2 templates userdef virtfunc namespace \
-	ref-types ref-params
+	ref-types ref-params method2
 
 all info install-info dvi install uninstall installcheck check:
 	@echo "Nothing to be done for $@..."

gdb/testsuite/gdb.cp/method2.cc

@@ -0,0 +1,27 @@
+struct A
+{
+  void method ();
+  void method (int a);
+  void method (A* a);
+};
+
+void
+A::method ()
+{
+}
+
+void
+A::method (int a)
+{
+}
+
+void
+A::method (A* a)
+{
+}
+
+int
+main (int argc, char** argv)
+{
+  return 0;
+}

gdb/testsuite/gdb.cp/method2.exp

@@ -0,0 +1,70 @@
+# Copyright 2007
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# This file is part of the gdb testsuite
+
+# This tests setting a break in an ambiguous c++ method with
+# current_language set to c.
+
+if { [skip_cplus_tests] } { continue }
+
+set testfile "method2"
+set srcfile ${testfile}.cc
+set binfile ${objdir}/${subdir}/${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
+     untested method2.exp
+     return -1
+}
+
+if [get_compiler_info $binfile "c++"] {
+  return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+if ![runto_main] then {
+    perror "couldn't run to breakpoint"
+    continue
+}
+
+proc test_break { lang } {
+    global gdb_prompt
+
+    gdb_test "set lang $lang" \
+	"" \
+	"setting language $lang"
+
+    send_gdb "break A::method\n"
+    gdb_expect {
+	-re ".0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2. A::method\\(A\\*\\) at .*\[\r\n\]*.3. A::method\\(int\\) at .*\[\r\n\]*\[\r\n\]*.4. A::method\\(\\) at .*\[\r\n\]*> $" {
+	    gdb_test "0" \
+		"canceled" \
+		"breaking in method ($lang)"
+	}
+	-re ".*$gdb_prompt $" { fail "breaking in method ($lang)" }
+	default { fail "breaking in method ($lang) (timeout)" }
+    }
+}
+
+test_break "c"
+test_break "c++"
+
+gdb_continue_to_end "continue to end"