From a8d136756b9882f90311af7205a00c0d97fea64d Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Fri, 4 Dec 2020 13:36:48 +0100
Subject: [PATCH] [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.
---
 gdb/testsuite/ChangeLog                    |  5 +++++
 gdb/testsuite/gdb.reverse/insn-reverse.exp | 26 +++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a88668d9b4e..6d7d0c27266 100644
--- 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 583195263ca..54af9582f23 100644
--- 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" ""]
-- 
2.30.2