[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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a88668d9b4e15824cd010907b734003b55ff5b1d..6d7d0c27266aab6e26dfda296176d3531fb4377f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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.

diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp
index 583195263caef2f8b8428db56f8b338c52fe8585..54af9582f23792f5f72280e8ff37176f3b870c62 100644 (file)
--- a/gdb/testsuite/gdb.reverse/insn-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp
@@ -79,23 +79,27 @@ 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)
+                   set insn_array($count) $expect_out(2,string)
+               }
+           }
 
-                   if [expr {$last_insn == $insn_addr}] {
-                       break
-                   }
+           if { $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
-                   }
+           if { $last_insn == $insn_addr } {
+               break
+           }
 
-                   set insn_array($count) $expect_out(2,string)
-               }
+           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" ""]