[binutils-gdb] [gdb/testsuite] Fix gdb.fortran/module.exp for debug info from other files

[gdb-buildbot@sergiodj.net]

*** TEST RESULTS FOR COMMIT 062f1fc13a075a34890988f3a396b5e58fc86396 ***

commit 062f1fc13a075a34890988f3a396b5e58fc86396
Author:     Tom de Vries <tdevries@suse.de>
AuthorDate: Thu Oct 17 10:07:05 2019 +0200
Commit:     Tom de Vries <tdevries@suse.de>
CommitDate: Thu Oct 17 10:07:05 2019 +0200

    [gdb/testsuite] Fix gdb.fortran/module.exp for debug info from other files
    
    On openSUSE Leap 15.1, I get:
    ...
    FAIL: gdb.fortran/module.exp: info variables -n
    ...
    because the info variables command prints info also for init.c:
    ...
    File init.c:^M
    24:     const int _IO_stdin_used;^M
    ...
    while the regexps in the test-case only expect info for module.f90.
    
    Fix this by extending the regexps.
    
    Tested on x86_64-linux.
    
    gdb/testsuite/ChangeLog:
    
    2019-10-17  Tom de Vries  <tdevries@suse.de>
    
            * gdb.fortran/module.exp: Allow info variables to print info for files
            other than module.f90.
    
    Change-Id: I401d8018b121fc7343f6bc8b671900349462457f

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 395a3ccacf..1075a1d614 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-17  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.fortran/module.exp: Allow info variables to print info for files
+	other than module.f90.
+
 2019-10-16  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.fortran/module.exp: Extend with 'info variables' test.
diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp
index 276f7dc3c2..a2aff3cb7c 100644
--- a/gdb/testsuite/gdb.fortran/module.exp
+++ b/gdb/testsuite/gdb.fortran/module.exp
@@ -53,7 +53,10 @@ gdb_test "info variables -n" \
 	 "33:\[ \t\]+${int_type} modmany::var_c;" \
 	 "33:\[ \t\]+${int_type} modmany::var_i;" \
 	 "37:\[ \t\]+${int_type} moduse::var_x;" \
-	 "37:\[ \t\]+${int_type} moduse::var_y;" ]
+	 "37:\[ \t\]+${int_type} moduse::var_y;(" \
+	 "" \
+	 "File .*:(" \
+	 "$decimal:.*)+)*"]
 
 
 # Do not use simple single-letter names as GDB would pick up for expectedly