Update copyright year range in all GDB files

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.cp / method2.exp

diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp
index ea8e7f61be62edb0b582af1cb29fd5d361815416..d653408cf393fa4eeec54d11124f8a4ccc7709e0 100644 (file)
--- a/gdb/testsuite/gdb.cp/method2.exp
+++ b/gdb/testsuite/gdb.cp/method2.exp
@@ -1,4 +1,4 @@
-# Copyright 2007, 2008 Free Software Foundation, Inc.
+# Copyright 2007-2021 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
@@ -20,25 +20,13 @@
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "method2"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested method2.exp
+if  {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
      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 {
+if {![runto_main]} {
     perror "couldn't run to breakpoint"
     continue
 }
@@ -50,18 +38,33 @@ proc test_break { 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\]*> $" {
+    # Menu items should be alphabetical
+    set ovlds [lsort {"" "int" "A*"}]
+    set items {"cancel" "all"}
+    foreach ovld $ovlds {
+        lappend items "A::method($ovld)"
+    }
+    set menu_items {}
+    set idx 0
+    foreach item $items {
+        lappend menu_items ".$idx. .*[string_to_regexp $item]"
+        incr idx
+    }
+    set expect [join $menu_items {.*[\r\n]*}]
+    gdb_test_multiple "break A::method" "breaking in method ($lang)" {
+        -re $expect {
            gdb_test "0" \
                "canceled" \
                "breaking in method ($lang)"
        }
-       -re ".*$gdb_prompt $" { fail "breaking in method ($lang)" }
-       default { fail "breaking in method ($lang) (timeout)" }
     }
 }
 
+# We want in this test to double-check the contents of the multiple-choice
+# menu that's printed when a breakpoint location is ambiguous.  So we need
+# to set multiple-symbols to "ask" first.
+gdb_test_no_output "set multiple-symbols ask"
+
 test_break "c"
 test_break "c++"