From 4bc4d42859e3b42c79c89295ef39944bdb3e6753 Mon Sep 17 00:00:00 2001 From: Sandra Loosemore Date: Thu, 30 Jul 2015 11:52:49 -0700 Subject: [PATCH] Reapply fix for gdb.cp/var-tag.exp C++ failures. 2015-07-30 Sandra Loosemore gdb/testsuite/ Reapply: 2014-05-21 Mark Wielaard * gdb.cp/var-tag.exp (do_global_tests): Handle underlying type. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cp/var-tag.exp | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index eda6625c38..6c836b6472 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2015-07-30 Sandra Loosemore + + Reapply: + 2014-05-21 Mark Wielaard + + * gdb.cp/var-tag.exp (do_global_tests): Handle underlying type. + 2015-07-30 Pedro Alves * linux-low.c (handle_extended_wait): Set the child's last diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp index 30aab99d82..60379e9295 100644 --- a/gdb/testsuite/gdb.cp/var-tag.exp +++ b/gdb/testsuite/gdb.cp/var-tag.exp @@ -28,13 +28,18 @@ if {[prepare_for_testing $testfile.exp $testfile \ proc do_global_tests {lang} { set invalid_print "Attempt to use a type name as an expression" - set ptypefmt "type = (class|enum|union|struct) %s {.*}" + + if {$lang == "c++"} { + set opt_underlying "(: unsigned int )?" + } else { + set opt_underlying "" + set ptypefmt "type = (class|enum|union|struct) %s $opt_underlying{.*}" with_test_prefix $lang { gdb_test_no_output "set language $lang" gdb_test "ptype C" "type = class C {.*}" gdb_test "print E" "= a" - gdb_test "ptype E" "type = enum E {.*}" + gdb_test "ptype E" "type = enum E $opt_underlying{.*}" gdb_test "print S" "= {}" gdb_test "ptype S" "type = struct S {.*}" gdb_test "print U" "= {.*}" @@ -48,7 +53,7 @@ proc do_global_tests {lang} { gdb_test "print SS" [format $invalid_print "SS"] gdb_test "ptype SS" [format $ptypefmt "SS"] gdb_test "print ee" "= .*" - gdb_test "ptype ee" "type = enum EE {.*}" + gdb_test "ptype ee" "type = enum EE $opt_underlying{.*}" gdb_test "print EE" [format $invalid_print "EE"] gdb_test "ptype EE" [format $ptypefmt "EE"] gdb_test "print uu" "= {.*}" -- 2.34.1