diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-09-16 13:27:32 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-09-16 13:27:32 +0200 |
| commit | 7361f908da9fbeceb0b65ac89b3dcecc4d8c57c2 (patch) | |
| tree | c100194cb0621884f1e9842a8e6e7b088897c5ec /gdb/testsuite | |
| parent | 0e25e7672778082e2934c378403ad8b57249d80f (diff) | |
| download | gdb-7361f908da9fbeceb0b65ac89b3dcecc4d8c57c2.zip gdb-7361f908da9fbeceb0b65ac89b3dcecc4d8c57c2.tar.gz gdb-7361f908da9fbeceb0b65ac89b3dcecc4d8c57c2.tar.bz2 | |
[gdb/testsuite] Catch condition evaluation errors in gdb_assert
When running test-case gdb.base/watchpoint-stops-at-right-insn.exp, we may run
into a tcl error, which can be reproduced reliably using this trigger patch:
...
+ set hw_watch_pc ""
gdb_assert {$sw_watch_pc == $hw_watch_pc} \
"hw watchpoint stops at right instruction"
...
such that we have:
...
ERROR: tcl error sourcing watchpoint-stops-at-right-insn.exp.
ERROR: missing operand at _@_
in expression "0x4004b7 == _@_"
(parsing expression "0x4004b7 == ")
invoked from within
"expr $sw_watch_pc == $hw_watch_pc"
("uplevel" body line 1)
invoked from within
"uplevel 1 expr $condition"
(procedure "gdb_assert" line 6)
invoked from within
"gdb_assert {$sw_watch_pc == $hw_watch_pc} \
"hw watchpoint stops at right instruction""
...
A similar problem was fixed in commit 5f0e2eb79e "GDB/testsuite: Fix a
catastrophic step-over-no-symbols.exp failure", by making the assert condition
more robust:
...
- gdb_assert {$before_addr != $after_addr} "advanced"
+ gdb_assert {{[string is integer -strict $before_addr] \
+ && [string is integer -strict $after_addr] \
+ && $before_addr != $after_addr}} "advanced"
...
Fix this instead in gdb_assert, by catching errors while evaluating the assert
condition.
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2020-09-16 Tom de Vries <tdevries@suse.de>
PR testsuite/26624
* lib/gdb.exp (gdb_assert): Catch errors in condition evaluation.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5e3125c..481d18a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2020-09-16 Tom de Vries <tdevries@suse.de> + PR testsuite/26624 + * lib/gdb.exp (gdb_assert): Catch errors in condition evaluation. + +2020-09-16 Tom de Vries <tdevries@suse.de> + PR testsuite/26618 * gdb.tui/new-layout.exp: Escape unbalanced braces. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 653f145..59439f8 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1689,8 +1689,8 @@ proc gdb_assert { condition {message ""} } { set message $condition } - set res [uplevel 1 expr $condition] - if {!$res} { + set code [catch {uplevel 1 expr $condition} res] + if {$code != 0 || !$res} { fail $message } else { pass $message |