espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-02 04:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/testsuite] Remove path names from error messages in gdb_file_cmd

Browse Source 
In gdb_file_cmd, perror is called with error message strings using $arg and
$GDB, both of which contain path names, which makes comparison of gdb.sum
files more difficult.

Fix this by using:
- [file tail $arg] instead of $arg
- GDB instead of $GDB.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-06-04  Tom de Vries  <tdevries@suse.de>

	* lib/gdb.exp (gdb_file_cmd): Avoid path names in error messages.
This commit is contained in:
Tom de Vries
2020-06-04 17:37:53 +02:00
parent 7d8b91fda9
commit 1c07a73f66
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2020-06-04 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (gdb_file_cmd): Avoid path names in error messages.
2020-06-04 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (gdb_file_cmd): Replace incomplete gdb_expect by

18
gdb/testsuite/lib/gdb.exp
View File

@ -1762,6 +1762,7 @@ proc gdb_file_cmd { arg } {
send_gdb "file $arg\n"
set new_symbol_table 0
set basename [file tail $arg]
gdb_expect 120 {
-re "Reading symbols from.*LZMA support was disabled.*$gdb_prompt $" {
verbose "\t\tLoaded $arg into $GDB; .gnu_debugdata found but no LZMA available"
@ -1780,36 +1781,39 @@ proc gdb_file_cmd { arg } {
}
-re "Load new symbol table from \".*\".*y or n. $" {
if { $new_symbol_table > 0 } {
perror "Couldn't load $arg, interactive prompt loop detected."
perror [join [list "Couldn't load $basename,"
"interactive prompt loop detected."]]
return -1
}
send_gdb "y\n" answer
incr new_symbol_table
set arg "$arg -- with new symbol table"
set suffix "-- with new symbol table"
set arg "$arg $suffix"
set basename "$basename $suffix"
exp_continue
}
-re "No such file or directory.*$gdb_prompt $" {
perror "($arg) No such file or directory"
perror "($basename) No such file or directory"
return -1
}
-re "A problem internal to GDB has been detected" {
perror "Couldn't load $arg into $GDB (GDB internal error)."
perror "Couldn't load $basename into GDB (GDB internal error)."
gdb_internal_error_resync
return -1
}
-re "$gdb_prompt $" {
perror "Couldn't load $arg into $GDB."
perror "Couldn't load $basename into GDB."
return -1
}
timeout {
perror "Couldn't load $arg into $GDB (timeout)."
perror "Couldn't load $basename into GDB (timeout)."
return -1
}
eof {
# This is an attempt to detect a core dump, but seems not to
# work. Perhaps we need to match .* followed by eof, in which
# gdb_expect does not seem to have a way to do that.
perror "Couldn't load $arg into $GDB (eof)."
perror "Couldn't load $basename into GDB (eof)."
return -1
}
}