Replace incorrect patch to gdb.cp/var-tag.exp.

2015-07-30  Sandra Loosemore  <sandra@codesourcery.com>

	gdb/testsuite/
	* gdb.cp/var-tag.exp (do_global_tests): Revert broken commit
	4bc4d42859e3b42c79c89295ef39944bdb3e6753 and apply the
	correct patch.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 029f3d749eaf871ceac1277c36e14ced0958101c..fa999c316f35bfc3aeb6ba5b491e1b8d7e4f3e59 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-30  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * gdb.cp/var-tag.exp (do_global_tests): Revert broken commit
+       4bc4d42859e3b42c79c89295ef39944bdb3e6753 and apply the
+       correct patch.
+
 2015-07-30  Sandra Loosemore  <sandra@codesourcery.com>
 
        * gdb.arch/ppc64-symtab-cordic.exp: Restrict to ppc64 targets.

diff --git a/gdb/testsuite/gdb.cp/var-tag.exp b/gdb/testsuite/gdb.cp/var-tag.exp
index 60379e9295c8ecb995e7918daeed5c3ea3170618..71d92378507296f8cc5310274514e21f72d02923 100644 (file)
--- a/gdb/testsuite/gdb.cp/var-tag.exp
+++ b/gdb/testsuite/gdb.cp/var-tag.exp
@@ -33,6 +33,7 @@ proc do_global_tests {lang} {
        set opt_underlying "(: unsigned int )?"
     } else {
        set opt_underlying ""
+    }
     set ptypefmt "type = (class|enum|union|struct) %s $opt_underlying{.*}"
 
     with_test_prefix $lang {
@@ -65,7 +66,7 @@ proc do_global_tests {lang} {
     # Each of them is in a separate CU as once its CU is expanded,
     # we're no longer using the quick fns API.
     gdb_test "print E2" "= a2"
-    gdb_test "ptype E2" "type = enum E2 {.*}"
+    gdb_test "ptype E2" "type = enum E2 $opt_underlying{.*}"
     gdb_test "print S2" "= {<No data fields>}"
     gdb_test "ptype S2" "type = struct S2 {.*}"
     gdb_test "print U2" "= {.*}"