From: Sandra Loosemore <sandra@codesourcery.com>
Date: Fri, 25 Sep 2015 01:22:57 +0000 (-0700)
Subject: Generalize enum regexp in gdb.cp/classes.exp.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9720e656055e5b906649c9f506a6de5a31337d07;p=binutils-gdb.git

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.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2c75cea4e40..85b612622b4 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 1d714d333b7..00f16fc4f20 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 $" {