summaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.cp/ptype-flags.exp
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/testsuite/gdb.cp/ptype-flags.exp')
-rw-r--r--gdb/testsuite/gdb.cp/ptype-flags.exp88
1 files changed, 71 insertions, 17 deletions
diff --git a/gdb/testsuite/gdb.cp/ptype-flags.exp b/gdb/testsuite/gdb.cp/ptype-flags.exp
index d1974117e2b..f88c83e03ce 100644
--- a/gdb/testsuite/gdb.cp/ptype-flags.exp
+++ b/gdb/testsuite/gdb.cp/ptype-flags.exp
@@ -33,7 +33,9 @@ if ![runto_main] then {
gdb_test_no_output "set language c++" ""
gdb_test_no_output "set width 0" ""
-proc do_check {name {flags ""} {show_typedefs 1} {show_methods 1} {raw 0}} {
+proc do_check_holder {name {flags ""} {show_typedefs 1} {show_methods 1}
+ {raw 0}} {
+
set contents {
{ base "public Base<T>" }
{ field public "Simple<T> t;" }
@@ -62,24 +64,76 @@ proc do_check {name {flags ""} {show_typedefs 1} {show_methods 1} {raw 0}} {
"" {} $flags
}
-do_check "basic test"
-do_check "no methods" "/m" 1 0
-do_check "no typedefs" "/t" 0 1
-do_check "no methods or typedefs" "/mt" 0 0
+proc do_check_typedef_holder {name {flags ""} {show_typedefs 1} {show_methods 1}
+ {raw 0}} {
+
+ set contents {
+ { field public "double a;" }
+ { field public "ns::scoped_double b;" }
+ { field public "global_double c;" }
+ }
+
+ if {$show_typedefs} {
+ lappend contents { typedef private "typedef double class_double;" }
+ }
+
+ if {$show_methods} {
+ lappend contents { method private "double method1(ns::scoped_double);" }
+ lappend contents { method private "double method2(global_double);" }
+ }
+
+ if {$raw} {
+ lappend contents { field private "TypedefHolder::class_double d;" }
+ } else {
+ lappend contents { field private "class_double d;" }
+ }
+
+ cp_test_ptype_class value2 $name "class" "TypedefHolder" $contents \
+ "" {} $flags
+}
-do_check "raw" "/r" 1 1 1
-do_check "raw no methods" "/rm" 1 0 1
-do_check "raw no typedefs" "/rt" 0 1 1
-do_check "raw no methods or typedefs" "/rmt" 0 0 1
+do_check_holder "basic test"
+do_check_holder "no methods" "/m" 1 0
+do_check_holder "no typedefs" "/t" 0 1
+do_check_holder "no methods or typedefs" "/mt" 0 0
+do_check_typedef_holder "typdefs class: basic test"
+do_check_typedef_holder "typdefs class: no methods" "/m" 1 0
+do_check_typedef_holder "typdefs class: no typedefs" "/t" 0 1 0
+do_check_typedef_holder "typdefs class:no methods or typedefs" "/mt" 0 0
+
+do_check_holder "raw" "/r" 1 1 1
+do_check_holder "raw no methods" "/rm" 1 0 1
+do_check_holder "raw no typedefs" "/rt" 0 1 1
+do_check_holder "raw no methods or typedefs" "/rmt" 0 0 1
+do_check_typedef_holder "typedef class: raw" "/r" 1 1 1
+do_check_typedef_holder "typedef class: raw no methods" "/rm" 1 0 1
+do_check_typedef_holder "typedef class: raw no typedefs" "/rt" 0 1 1
+do_check_typedef_holder "typedef class: raw no methods or typedefs" "/rmt" 0 0 1
gdb_test_no_output "set print type methods off"
-do_check "basic test, default methods off" "" 1 0
-do_check "methods, default methods off" "/M" 1 1
-do_check "no typedefs, default methods off" "/t" 0 0
-do_check "methods, no typedefs, default methods off" "/Mt" 0 1
+do_check_holder "basic test, default methods off" "" 1 0
+do_check_holder "methods, default methods off" "/M" 1 1
+do_check_holder "no typedefs, default methods off" "/t" 0 0
+do_check_holder "methods, no typedefs, default methods off" "/Mt" 0 1
+do_check_typedef_holder \
+ "typedef class: basic test, default methods off" "" 1 0
+do_check_typedef_holder \
+ "typedef class: methods, default methods off" "/M" 1 1
+do_check_typedef_holder \
+ "typedef class: no typedefs, default methods off" "/t" 0 0
+do_check_typedef_holder \
+ "typedef class: methods, no typedefs, default methods off" "/Mt" 0 1
gdb_test_no_output "set print type typedefs off"
-do_check "basic test, default methods+typedefs off" "" 0 0
-do_check "methods, default methods+typedefs off" "/M" 0 1
-do_check "typedefs, default methods+typedefs off" "/T" 1 0
-do_check "methods typedefs, default methods+typedefs off" "/MT" 1 1
+do_check_holder "basic test, default methods+typedefs off" "" 0 0
+do_check_holder "methods, default methods+typedefs off" "/M" 0 1
+do_check_holder "typedefs, default methods+typedefs off" "/T" 1 0
+do_check_holder "methods typedefs, default methods+typedefs off" "/MT" 1 1
+do_check_typedef_holder \
+ "typedef class: basic test, default methods+typedefs off" "" 0 0
+do_check_typedef_holder \
+ "typedef class: methods, default methods+typedefs off" "/M" 0 1
+do_check_typedef_holder \
+ "typedef class: typedefs, default methods+typedefs off" "/T" 1 0
+do_check_typedef_holder \
+ "typedef class: methods typedefs, default methods+typedefs off" "/MT" 1 1