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

Fix Tcl quoting in gdb_assert

Browse Source 
The gdb_assert proc under-quotes the expression that is passed in.
This leads to weird code in a couple of spots that tries to
compensate:

    gdb_assert {{$all_regs eq $completed_regs}} ...

The fix is to add a bit of quoting when evaluating the expression.
This commit is contained in:
Tom Tromey
2023-02-15 14:57:10 -07:00
parent c32ea73114
commit eb94f42787
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/testsuite/gdb.base/completion.exp
View File

@ -159,7 +159,7 @@ foreach {-> reg} [regexp -all -inline -line {^info registers (\w+\S*)} $regs_out
lappend completed_regs $reg lappend completed_regs $reg
} }
set completed_regs [join [lsort $completed_regs]] set completed_regs [join [lsort $completed_regs]]
gdb_assert {{$all_regs eq $completed_regs}} "complete 'info registers '" gdb_assert {$all_regs eq $completed_regs} "complete 'info registers '"
# Tests below are about tab-completion, which doesn't work if readline # Tests below are about tab-completion, which doesn't work if readline
# library isn't used. Check it first. # library isn't used. Check it first.

4
gdb/testsuite/gdb.base/step-over-no-symbols.exp
View File

@ -76,9 +76,9 @@ proc test_step_over { displaced } {
set after_addr [get_pc "get after PC"] set after_addr [get_pc "get after PC"]
gdb_assert {{[regexp "^${hex}$" $before_addr] \ gdb_assert {[regexp "^${hex}$" $before_addr] \
&& [regexp "^${hex}$" $after_addr] \ && [regexp "^${hex}$" $after_addr] \
&& $before_addr != $after_addr}} "advanced" && $before_addr != $after_addr} "advanced"
} }
foreach displaced { "off" "on" "auto" } { foreach displaced { "off" "on" "auto" } {

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

@ -1942,7 +1942,7 @@ proc gdb_assert { condition {message ""} } {
set message $condition set message $condition
} }
set code [catch {uplevel 1 expr $condition} res] set code [catch {uplevel 1 [list expr $condition]} res]
if {$code == 1} { if {$code == 1} {
# If code is 1 (TCL_ERROR), it means evaluation failed and res contains # If code is 1 (TCL_ERROR), it means evaluation failed and res contains
# an error message. Print the error message, and set res to 0 since we # an error message. Print the error message, and set res to 0 since we