diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6f92df87a6..a260377b9f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-10-14 Gary Benson + + * gdb.python/py-format-string.exp (test_deref_refs): Treat + "_vptr$Base" as correct, in addition to "_vptr.Base". + (test_mixed): Likewise. + 2020-10-27 Gary Benson * gdb.mi/mi-fortran-modules.exp: Check skip_fortran_tests. diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp index 792d60c09d..b7acc242ed 100644 --- a/gdb/testsuite/gdb.python/py-format-string.exp +++ b/gdb/testsuite/gdb.python/py-format-string.exp @@ -509,7 +509,7 @@ proc test_deref_refs {} { if { $current_lang == "c++" } { check_var_with_bool_opt "deref_refs" "a_point_t_ref" check_var_with_bool_opt "deref_refs" "a_base_ref" \ - "${default_ref_regexp}: \\{_vptr\\.Base = ${default_pointer_regexp} , a = 42, static a_static_member = 2019\\}" + "${default_ref_regexp}: \\{_vptr\[.\$\]Base = ${default_pointer_regexp} , a = 42, static a_static_member = 2019\\}" } } @@ -905,7 +905,7 @@ proc test_mixed {} { check_format_string "a_base_ref" \ "deref_refs=True, static_members=False" \ - "${default_ref_regexp}: \\{_vptr\\.Base = ${default_pointer_regexp} , a = 42\\}" + "${default_ref_regexp}: \\{_vptr\[.\$\]Base = ${default_pointer_regexp} , a = 42\\}" } }