[gdb/testsuite] Fix info-types.exp for debug info from more than one file

On openSUSE Leap 15.0, I get:
...
FAIL: gdb.base/info-types.exp: l=c: info types
FAIL: gdb.base/info-types.exp: l=c++: info types
...
because the info type command prints info for files info-types.c, stddef.h,
elf-init.c and init.c, while the regexp in the test-case expect only info for
info-types.c.

Fix this by extending the regexp.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-07-24  Tom de Vries  <tdevries@suse.de>

	* gdb.base/info-types.exp: Allow info types to print info for more than
	one file.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 01a70aa98d1a8ec3432979446740139371c9c893..4199f5bc63ce66f308f4a82c58546a7482b70fdf 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-24  Tom de Vries  <tdevries@suse.de>
+
+       * gdb.base/info-types.exp: Allow info types to print info for more than
+       one file.
+
 2019-07-23  Tom de Vries  <tdevries@suse.de>
 
        PR testsuite/24842

diff --git a/gdb/testsuite/gdb.base/info-types.exp b/gdb/testsuite/gdb.base/info-types.exp
index 3a514b5bc191793023aeea5f128ceb8e4a389b49..fd190ae58f487cf173d57ae9bcd86187d80e3df0 100644 (file)
--- a/gdb/testsuite/gdb.base/info-types.exp
+++ b/gdb/testsuite/gdb.base/info-types.exp
@@ -86,7 +86,9 @@ proc run_test { lang } {
                 "19:\[\t \]+typedef float nested_float_t;" \
                 "18:\[\t \]+typedef int nested_int_t;" \
                 "62:\[\t \]+typedef union_t nested_union_t;" \
-                "\[\t \]+unsigned int"]
+                "\[\t \]+unsigned int(" \
+                "" \
+                "File .*:.*)?" ]
     } else {
        set output_re \
            [multi_line \
@@ -116,7 +118,9 @@ proc run_test { lang } {
                 "18:\[\t \]+typedef int nested_int_t;" \
                 "62:\[\t \]+typedef union union_t nested_union_t;" \
                 "56:\[\t \]+union union_t;" \
-                "\[\t \]+unsigned int" ]
+                "\[\t \]+unsigned int(" \
+                "" \
+                "File .*:.*)?" ]
     }
 
     gdb_test "info types" $output_re