From: Carl Love <cel@us.ibm.com>
Date: Tue, 20 Jul 2021 22:40:47 +0000 (-0500)
Subject: Fixes for mi-fortran-modules.exp fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39f6207e3ed2a461d7025c5f968a3e56e2d0402b;p=binutils-gdb.git

Fixes for mi-fortran-modules.exp fixes

Output has additional information for a given filename.

gdb/testsuite/ChangeLog
	* gdb.mi/mi-fortran-modules.exp (system_modules_pattern,
	system_module_symbols_pattern): Add check for additional symbols
	on the line
---

diff --git a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
index 38aa36a6353..06069953afa 100644
--- a/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
+++ b/gdb/testsuite/gdb.mi/mi-fortran-modules.exp
@@ -35,9 +35,9 @@ mi_runto_main
 
 # Patterns to skip optional system modules that appear with later versions of GFortran.
 set system_modules_pattern \
-    "\{filename=\"\[^\"\]+/ieee/\[^/\]+\.F90\",fullname=\"\[^\"\]+\",symbols=\\\[(\[^\]\]+)\\\]\},"
+    "\{filename=\"\[^\"\]+/ieee/\[^/\]+\.F90\",fullname=\"\[^\"\]+\",symbols=\\\[(\[^\]\]+)\\\]\},.*"
 set system_module_symbols_pattern \
-    "\{module=\"\[^\"\]*ieee\[^\"\]*\",files=\\\[\{filename=\"\[^\"\]+\",fullname=\"\[^\"\]+\",symbols=\\\[\[^\]\]+\\\]\}\\\]\},"
+    "\{module=\"\[^\"\]*ieee\[^\"\]*\",files=\\\[\{filename=\"\[^\"\]+\",fullname=\"\[^\"\]+\",symbols=\\\[\[^\]\]+\\\]\}\\\]\},.*"
 
 mi_gdb_test "101-symbol-info-modules" \
     "101\\^done,symbols=\{debug=\\\[($system_modules_pattern)*\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"16\",name=\"mod1\"\},\{line=\"27\",name=\"mod2\"\}\\\]\},\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"16\",name=\"mod3\"\},\{line=\"32\",name=\"modmany\"\},\{line=\"41\",name=\"moduse\"\}\\\]\}\\\]\}" \