[PATCH 7/8] testsuite, gdb.btrace: adjust expected source line in non-stop.exp

[Markus Metzger <markus.t.metzger@intel.com>]

In gdb.btrace/non-stop.exp, we hard-code expected source lines assuming we
know how they would match to the recorded trace.  Despite the fact that we
should really have been using an assembly source, the assumptions work
pretty well.

With clang-6 -m32, we found a case where the assumptions do not hold.
Adjust the expected source lines a little bit to cover that case, as well.

Should we run into more cases like this, we will have to switch to an
assembly source file.

gdb/testsuite/ChangeLog:
2020-12-17  Markus Metzger  <markus.t.metzger@intel.com>

	* gdb.btrace/non-stop.exp: Adjust expected source lines.
---
 gdb/testsuite/gdb.btrace/non-stop.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index 40cced7a8bb..e509d65d660 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -111,10 +111,10 @@ gdb_test "thread apply all info rec" ".*"
 gdb_test "info threads" ".*"
 
 with_test_prefix "navigate" {
-    gdb_test "thread apply 1 record goto 2" "$loop_line"
+    gdb_test "thread apply 1 record goto 3" "$loop_line"
     gdb_test "thread apply 2 record goto 4" "$loop_line"
     gdb_test "thread apply 1 info record" \
-        ".*Replay in progress\.  At instruction 2\." "thread 1 at insn 2"
+        ".*Replay in progress\.  At instruction 3\." "thread 1 at insn 3"
     gdb_test "thread apply 2 info record" \
         ".*Replay in progress\.  At instruction 4\." "thread 2 at insn 4"
 
-- 
2.26.2

Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Gary Kershaw
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928