From 032a0fca009e8ae7ffc5443d07d959c839dc7af4 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Thu, 30 Jul 2015 14:20:01 -0700 Subject: [PATCH] Replace incorrect patch to gdb.cp/var-tag.exp. 2015-07-30 Sandra Loosemore gdb/testsuite/ * gdb.cp/var-tag.exp (do_global_tests): Revert broken commit 4bc4d42859e3b42c79c89295ef39944bdb3e6753 and apply the correct patch. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.cp/var-tag.exp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 029f3d7..fa999c3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2015-07-30 Sandra Loosemore + * gdb.cp/var-tag.exp (do_global_tests): Revert broken commit + 4bc4d42859e3b42c79c89295ef39944bdb3e6753 and apply the + correct patch. + +2015-07-30 Sandra Loosemore + * gdb.arch/ppc64-symtab-cordic.exp: Restrict to ppc64 targets. 2015-07-30 Sandra Loosemore diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp index 60379e9..71d9237 100644 --- a/gdb/testsuite/gdb.cp/var-tag.exp +++ b/gdb/testsuite/gdb.cp/var-tag.exp @@ -33,6 +33,7 @@ proc do_global_tests {lang} { set opt_underlying "(: unsigned int )?" } else { set opt_underlying "" + } set ptypefmt "type = (class|enum|union|struct) %s $opt_underlying{.*}" with_test_prefix $lang { @@ -65,7 +66,7 @@ proc do_global_tests {lang} { # Each of them is in a separate CU as once its CU is expanded, # we're no longer using the quick fns API. gdb_test "print E2" "= a2" - gdb_test "ptype E2" "type = enum E2 {.*}" + gdb_test "ptype E2" "type = enum E2 $opt_underlying{.*}" gdb_test "print S2" "= {}" gdb_test "ptype S2" "type = struct S2 {.*}" gdb_test "print U2" "= {.*}" -- 2.7.4