[gdb/testsuite] Fix control-flow in gdb.reverse/insn-reverse.exp

In gdb.reverse/insn-reverse.exp, we have loop containing a call to
gdb_test_multiple, which itself contains a break:
...
  for {} {$count < 500} {incr count} {
    ...
    gdb_test_multiple "x/i \$pc" "" {
      ...
      break
    }
...

On SLE-11 with:
...
$ runtest --version
Expect version is       5.44.1.11
Tcl version is          8.5
Framework version is    1.4.4
...
the break doesn't seem to have the effect of breaking out of the loop.

The break does have the effect of terminating evaluation of the expect clause,
which means we don't set insn_array, after which we run into:
...
ERROR: tcl error sourcing src/gdb/testsuite/gdb.reverse/insn-reverse.exp.
ERROR: can't read "insn_array(5)": no such element in array
...

gdb/testsuite/ChangeLog:

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

	* gdb.reverse/insn-reverse.exp: Don't break inside gdb_test_multiple
	clause.
This commit is contained in:
Tom de Vries
2020-12-04 13:36:48 +01:00
parent f17727b349
commit a8d136756b
2 changed files with 21 additions and 12 deletions

View File

@ -1,3 +1,8 @@
2020-12-04 Tom de Vries <tdevries@suse.de>
* gdb.reverse/insn-reverse.exp: Don't break inside gdb_test_multiple
clause.
2020-12-04 Tom de Vries <tdevries@suse.de>
* gdb.reverse/insn-reverse.exp: Fix count handling.

View File

@ -79,25 +79,29 @@ proc test { func testcase_nr } {
set count 0
set insn_addr ""
for {} {$count < 500} {incr count} {
set prev_insn_addr $insn_addr
set insn_addr ""
gdb_test_multiple "x/i \$pc" "" {
-re ".* ($hex) <.*>:\[ \t\]*(.*)\r\n$gdb_prompt $" {
set prev_insn_addr $insn_addr
set insn_addr $expect_out(1,string)
if [expr {$last_insn == $insn_addr}] {
break
}
if { $prev_insn_addr == $insn_addr } {
# Failed to make progress, might have run into SIGILL.
unsupported "no progress at: $expect_out(2,string)"
break
}
set insn_array($count) $expect_out(2,string)
}
}
if { $insn_addr == "" } {
break
}
if { $last_insn == $insn_addr } {
break
}
if { $prev_insn_addr == $insn_addr } {
# Failed to make progress, might have run into SIGILL.
unsupported "no progress at: $expect_out(2,string)"
break
}
set pre_regs($count) [capture_command_output "info all-registers" ""]
gdb_test "si" "" ""
}