aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandra Loosemore <sandra@codesourcery.com>2015-09-24 18:22:57 -0700
committerSandra Loosemore <sandra@codesourcery.com>2015-09-24 18:22:57 -0700
commit9720e656055e5b906649c9f506a6de5a31337d07 (patch)
tree594c283d8dc1728bc110185bb6ed9afb4c952822
parentaebd6ce4ca570f0506717873c686d8c9ca5fffe1 (diff)
downloadgdb-9720e656055e5b906649c9f506a6de5a31337d07.zip
gdb-9720e656055e5b906649c9f506a6de5a31337d07.tar.gz
gdb-9720e656055e5b906649c9f506a6de5a31337d07.tar.bz2
Generalize enum regexp in gdb.cp/classes.exp.
2015-09-24 Sandra Loosemore <sandra@codesourcery.com> gdb/testsuite/ * gdb.cp/classes.exp (test_enums): Generalize regexp to allow short or char as base type.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.cp/classes.exp2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2c75cea..85b6126 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-24 Sandra Loosemore <sandra@codesourcery.com>
+
+ * gdb.cp/classes.exp (test_enums): Generalize regexp to allow
+ short or char as base type.
+
2015-09-23 Sandra Loosemore <sandra@codesourcery.com>
* gdb.cp/var-tag.exp (do_global_tests): Generalize opt_underlying
diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 1d714d3..00f16fc 100644
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -419,7 +419,7 @@ proc test_enums {} {
# ptype on the enum member
gdb_test_multiple "ptype obj_with_enum.priv_enum" "ptype obj_with_enum.priv_enum" {
- -re "type = enum ClassWithEnum::PrivEnum (: unsigned int )?\{ ?(ClassWithEnum::)?red, (ClassWithEnum::)?green, (ClassWithEnum::)?blue, (ClassWithEnum::)?yellow = 42 ?\}$nl$gdb_prompt $" {
+ -re "type = enum ClassWithEnum::PrivEnum (: unsigned (int|short|char) )?\{ ?(ClassWithEnum::)?red, (ClassWithEnum::)?green, (ClassWithEnum::)?blue, (ClassWithEnum::)?yellow = 42 ?\}$nl$gdb_prompt $" {
pass "ptype obj_with_enum.priv_enum"
}
-re "type = enum PrivEnum \{ ?(ClassWithEnum::)?red, (ClassWithEnum::)?green, (ClassWithEnum::)?blue, (ClassWithEnum::)?yellow = 42 ?\}$nl$gdb_prompt $" {