espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 13:56:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/testsuite] Fix gdb.base/maint.exp with -readnow

Browse Source 
With test-case gdb.base/maint.exp and target board -readnow, I run into:
...
FAIL: gdb.base/maint.exp: maint info line-table w/o a file name
...

The problem is that this and other regexps anchored using '^':
...
    -re "^$gdb_prompt $" {
...
don't trigger because other regexps don't consume the entire preceding line.

This is partly due to the addition of the IS-STMT column.

Fix this by making the regexps consume entire lines.

Tested on x86_64-linux with native and target board readnow, as well as
check-read1 and check-readmore.
This commit is contained in:
Tom de Vries
2021-12-09 11:15:34 +01:00
parent fb44b07969
commit 6722ee73f7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/testsuite/gdb.base/maint.exp
View File

@ -432,11 +432,11 @@ gdb_test "maint" \
set saw_srcfile 0 set saw_srcfile 0
gdb_test_multiple "maint info line-table" \ gdb_test_multiple "maint info line-table" \
"maint info line-table w/o a file name" { "maint info line-table w/o a file name" {
-re "symtab: \[^\n\r\]+${srcfile} \\(\\(struct symtab \\*\\) $hex\\)\r\nlinetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS" { -re "symtab: \[^\n\r\]+${srcfile} \\(\\(struct symtab \\*\\) $hex\\)\r\nlinetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS\[^\r\n\]*" {
set saw_srcfile 1 set saw_srcfile 1
exp_continue exp_continue
} }
-re "symtab: \[^\n\r\]+ \\(\\(struct symtab \\*\\) $hex\\)\r\nlinetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS" { -re "symtab: \[^\n\r\]+ \\(\\(struct symtab \\*\\) $hex\\)\r\nlinetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS\[^\r\n\]*" {
# Match each symtab to avoid overflowing expect's buffer. # Match each symtab to avoid overflowing expect's buffer.
exp_continue exp_continue
} }
@ -444,7 +444,7 @@ gdb_test_multiple "maint info line-table" \
# For symtabs with no linetable. # For symtabs with no linetable.
exp_continue exp_continue
} }
-re "^$decimal\[ \t\]+$decimal\[ \t\]+$hex\r\n" { -re "^$decimal\[ \t\]+$decimal\[ \t\]+$hex\[^\r\n\]*\r\n" {
# Line table entries can be long too: # Line table entries can be long too:
# #
# INDEX LINE ADDRESS # INDEX LINE ADDRESS
@ -462,7 +462,7 @@ gdb_test_multiple "maint info line-table" \
# Match each line to avoid overflowing expect's buffer. # Match each line to avoid overflowing expect's buffer.
exp_continue exp_continue
} }
-re "^$decimal\[ \t\]+END\[ \t\]+$hex\r\n" { -re "^$decimal\[ \t\]+END\[ \t\]+$hex\[^\r\n\]*\r\n" {
# Matches an end marker in the above. # Matches an end marker in the above.
exp_continue exp_continue
} }