Fixes for mi-fortran-modules.exp fixes

Message ID e73daf767fcdadcabd6ea3ddd7406fb00520df2b.camel@us.ibm.com
State New
Headers show
Series
  • Fixes for mi-fortran-modules.exp fixes
Related show

Commit Message

Lancelot SIX via Gdb-patches July 21, 2021, 5:04 p.m.
GDB maintainers:

The expected output for the system_modules_pattern does not cover all
of the data.  This patch updates the expected line to cover the
additional information at the end of the line.


This patch was tested on Power 9 and Intel without any regression
errors.

Please let me know if it is acceptable.

                            Carl Love

--------------------------------------------------------------------

Fixes for mi-fortran-modules.exp fixes

Output has additional information for a given filename.

gdb/testsuite/ChangeLog
2021-07-20  Carl Love  <cel@us.ibm.com>
	* gdb.mi/mi-fortran-modules.exp (system_modules_pattern,
	system_module_symbols_pattern): Add check for additional
symbols
	on the line
---
 gdb/testsuite/gdb.mi/mi-fortran-modules.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


-- 
2.17.1

Patch

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\"\}\\\]\}\\\]\}" \