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

With test-case gdb.base/relocate.exp and target board readnow, we get:
...
FAIL: gdb.base/relocate.exp: symbol-file with offset
FAIL: gdb.base/relocate.exp: add-symbol-file with offset
FAIL: gdb.base/relocate.exp: add-symbol-file with offset, text address given
FAIL: gdb.base/relocate.exp: add-symbol-file with offset, data address given
...

Fix these FAILs by updating the regexps for -readnow.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-10-28  Tom de Vries  <tdevries@suse.de>

	* gdb.base/relocate.exp: Update regexp for -readnow.
This commit is contained in:
Tom de Vries
2020-10-28 21:04:12 +01:00
parent f93b876030
commit 32a5f98aa4
2 changed files with 9 additions and 4 deletions

View File

@@ -1,3 +1,7 @@
2020-10-28 Tom de Vries <tdevries@suse.de>
* gdb.base/relocate.exp: Update regexp for -readnow.
2020-10-28 Tom de Vries <tdevries@suse.de>
* gdb.dwarf2/dw2-error.exp: Mark failure break in main as known with

View File

@@ -222,8 +222,9 @@ if { "${function_foo_addr}" == "${new_function_foo_addr}" } {
set offset 0x10000
clean_restart
set readnow_re "Expanding full symbols from ${binfile}\.\.\."
gdb_test "symbol-file -o $offset $binfile" \
"Reading symbols from ${binfile}\.\.\." \
"Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \
"symbol-file with offset"
with_test_prefix "static vars" {
@@ -253,7 +254,7 @@ with_test_prefix "functions" {
set offset 0x10000
clean_restart
gdb_test "add-symbol-file -o $offset $binfile" \
"Reading symbols from ${binfile}\.\.\." \
"Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \
"add-symbol-file with offset" \
"add symbol table from file \".*${testfile}\\.o\" with all sections offset by $offset\[\r\n\]+\\(y or n\\) " \
"y"
@@ -284,7 +285,7 @@ with_test_prefix "functions, 2nd" {
set text [ format "0x%x" [expr ${function_foo_addr} + 0x20000] ]
clean_restart
gdb_test "add-symbol-file $binfile -o $offset $text" \
"Reading symbols from ${binfile}\.\.\." \
"Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \
"add-symbol-file with offset, text address given" \
"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = ${text}\[\r\n\]+with other sections offset by ${offset}\[\r\n\]+\\(y or n\\) " \
"y"
@@ -301,7 +302,7 @@ with_test_prefix "functions, 3rd" {
set data [ format "0x%x" [expr ${global_foo_addr} + 0x20000] ]
clean_restart
gdb_test "add-symbol-file $binfile -o $offset -s .data $data" \
"Reading symbols from ${binfile}\.\.\." \
"Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \
"add-symbol-file with offset, data address given" \
"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.data_addr = ${data}\[\r\n\]+with other sections offset by ${offset}\[\r\n\]+\\(y or n\\) " \
"y"