diff mbox

[committed,testsuite] Reapply fix for gdb.cp/var-tag.exp C++ failures

Message ID 55BA74C2.8050800@codesourcery.com
State New
Headers show

Commit Message

Sandra Loosemore July 30, 2015, 7:02 p.m. UTC
I have reapplied this patch from last year;

https://sourceware.org/ml/gdb-patches/2014-05/msg00480.html

This fix was lost when the change that added the gdb.cp/var-tag.exp 
testcase was reverted and then restored again a few months ago.  In the 
restored version of the testcase, there were 12 FAILs fixed by this 
patch, rather than 9 as previously reported in the original version:

FAIL: gdb.cp/var-tag.exp: before start: c++: ptype E
FAIL: gdb.cp/var-tag.exp: before start: c++: ptype ee
FAIL: gdb.cp/var-tag.exp: before start: c++: ptype EE
FAIL: gdb.cp/var-tag.exp: before start: c++: ptype E2
FAIL: gdb.cp/var-tag.exp: in main: c++: ptype E
FAIL: gdb.cp/var-tag.exp: in main: c++: ptype ee
FAIL: gdb.cp/var-tag.exp: in main: c++: ptype EE
FAIL: gdb.cp/var-tag.exp: in main: c++: ptype E2
FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype E
FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype ee
FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype EE
FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype E2

-Sandra

Comments

Keith Seitz July 30, 2015, 8:56 p.m. UTC | #1
On 07/30/2015 12:02 PM, Sandra Loosemore wrote:
> FAIL: gdb.cp/var-tag.exp: before start: c++: ptype E
> FAIL: gdb.cp/var-tag.exp: before start: c++: ptype ee
> FAIL: gdb.cp/var-tag.exp: before start: c++: ptype EE
> FAIL: gdb.cp/var-tag.exp: before start: c++: ptype E2
> FAIL: gdb.cp/var-tag.exp: in main: c++: ptype E
> FAIL: gdb.cp/var-tag.exp: in main: c++: ptype ee
> FAIL: gdb.cp/var-tag.exp: in main: c++: ptype EE
> FAIL: gdb.cp/var-tag.exp: in main: c++: ptype E2
> FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype E
> FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype ee
> FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype EE
> FAIL: gdb.cp/var-tag.exp: in C::f: c++: ptype E2

Yeah, GCC5 is now outputting (into DWARF) the underlying types used to
implement the enum. I had a patch lying around, but I forgot about it.
Thank you for doing this.

> diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp
> index 30aab99..60379e9 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 ""

Missing '}' ?

> +    set ptypefmt "type = (class|enum|union|struct) %s $opt_underlying{.*}"

Keith
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp
index 30aab99..60379e9 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" "= {<No data fields>}"
     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" "= {.*}"