aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.cp/var-tag.exp3
2 files changed, 8 insertions, 1 deletions
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 <sandra@codesourcery.com>
+ * gdb.cp/var-tag.exp (do_global_tests): Revert broken commit
+ 4bc4d42859e3b42c79c89295ef39944bdb3e6753 and apply the
+ correct patch.
+
+2015-07-30 Sandra Loosemore <sandra@codesourcery.com>
+
* gdb.arch/ppc64-symtab-cordic.exp: Restrict to ppc64 targets.
2015-07-30 Sandra Loosemore <sandra@codesourcery.com>
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" "= {<No data fields>}"
gdb_test "ptype S2" "type = struct S2 {.*}"
gdb_test "print U2" "= {.*}"