btrace: fix tests for 32-bit

The x86-record_goto.S assembly source file does not build on 32-bit.
This breaks many tests that use this file.

Split it into x86_64-record_goto.S and i686-record_goto.S.  Luckily, we
can use either one with the same test .exp file.

It further turned out that most tests do not really need a fixed binary;
they should work pretty well with a newly-compiled C program.  The
one thing that breaks this is the heavy use of "record goto" to navigate
inside the recorded execution.

Combine step.exp, next,exp, and finish.exp into a single test step.exp
and use normal stepping and reverse-stepping commands for navigation.

testsuite/
	* gdb.btrace/next.exp: Merged into step.exp.
	* gdb.btrace/finish.exp: Merged into step.exp.
	* gdb.btrace/nexti.exp: Merged into stepi.exp.
	* gdb.btrace/step.exp: Use record_goto.c as test file.  Avoid using
	"record goto" and checking the exact replay position.
	* gdb.btrace/stepi.exp: Choose test file based on target.  Do not
	check for "Recording format" in "info record" output.
	* gdb.btrace/record_goto.exp: Choose test file based on target.
	* gdb.btrace/x86-record_goto.S: Renamed into ...
	* gdb.btrace/x86_64-record_goto.S: ... this.
	* gdb.btrace/i686-record_goto.S: New.
	* gdb.btrace/x86-tailcall.S: Renamed into ...
	* gdb.btrace/x86_64-tailcall.S: ... this.
	* gdb.btrace/i686-tailcall.S: New.
	* gdb.btrace/x86-tailcall.c: Renamed into ...
	* gdb.btrace/tailcall.c: ... this.  Split "return ++answer" into two
	separate statements.  Update test.
	* gdb.btrace/delta.exp: Use record_goto.c as test file.
	* gdb.btrace/gcore.exp: Use record_goto.c as test file.
	* gdb.btrace/nohist.exp: Use record_goto.c as test file.
	* gdb.btrace/tailcall.exp: Choose test file based on target.
	* gdb.btrace/Makefile.in: Remove next, finish, and nexti.

1 files changed, 11 insertions, 55 deletions

diff --git a/gdb/testsuite/gdb.btrace/step.exp b/gdb/testsuite/gdb.btrace/step.exp
index 22aded8..c1c862b 100644
--- a/gdb/testsuite/gdb.btrace/step.exp
+++ b/gdb/testsuite/gdb.btrace/step.exp
@@ -20,8 +20,9 @@
 # check for btrace support
 if { [skip_btrace_tests] } { return -1 }
 
+standard_testfile record_goto.c
+
 # start inferior
-standard_testfile x86-record_goto.S
 if [prepare_for_testing step.exp $testfile $srcfile] {
     return -1
 }
@@ -34,58 +35,13 @@ if ![runto_main] {
 gdb_test_no_output "record btrace"
 gdb_test "next"
 
-proc check_replay_at { insn } {
-  gdb_test "info record" [join [list \
-    "Active record target: record-btrace" \
-    "Recording format: .*" \
-    "Recorded 40 instructions in 16 functions \\\(0 gaps\\\) for .*" \
-    "Replay in progress\.  At instruction $insn\." \
-    ] "\r\n"]
-}
-
-# let's start by stepping back into the function we just returned from
-gdb_test "reverse-step" ".*fun4\.5.*"
-with_test_prefix "reverse-step to 39" { check_replay_at 39 }
-
-# again
-gdb_test "reverse-step" ".*fun3\.4.*"
-with_test_prefix "reverse-step to 37" { check_replay_at 37 }
-
-# and again
-gdb_test "reverse-step" ".*fun2\.3.*"
-with_test_prefix "reverse-step to 35" { check_replay_at 35 }
-
-# once more
-gdb_test "reverse-step" ".*fun1\.2.*"
-with_test_prefix "reverse-step to 33" { check_replay_at 33 }
-
-# and out again the other side
-gdb_test "reverse-step" ".*fun2\.2.*"
-with_test_prefix "reverse-step to 30" { check_replay_at 30 }
-
-# once again
-gdb_test "reverse-step" ".*fun3\.3.*"
-with_test_prefix "reverse-step to 27" { check_replay_at 27 }
-
-# and back the way we came
+# let's step around a bit
+gdb_test "reverse-next" ".*main\.2.*"
+gdb_test "step" ".*fun4\.2.*"
+gdb_test "next" ".*fun4\.3.*"
 gdb_test "step" ".*fun2\.2.*"
-with_test_prefix "step to 30" { check_replay_at 30 }
-
-gdb_test "step" ".*fun1\.2.*"
-with_test_prefix "step to 33" { check_replay_at 33 }
-
-gdb_test "step" ".*fun2\.3.*"
-with_test_prefix "step to 35" { check_replay_at 35 }
-
-gdb_test "step" ".*fun3\.4.*"
-with_test_prefix "step to 37" { check_replay_at 37 }
-
-gdb_test "step" ".*fun4\.5.*"
-with_test_prefix "step to 39" { check_replay_at 39 }
-
-gdb_test "step" ".*main\.3.*"
-gdb_test "info record" [join [list \
-  "Active record target: record-btrace" \
-  "Recording format: .*" \
-  "Recorded 40 instructions in 16 functions \\\(0 gaps\\\) for \[^\\\r\\\n\]*" \
-  ] "\r\n"] "step to live"
+gdb_test "finish" ".*fun4\.4.*"
+gdb_test "reverse-step" ".*fun2\.3.*"
+gdb_test "reverse-finish" ".*fun4\.3.*"
+gdb_test "reverse-next" ".*fun4\.2.*"
+gdb_test "reverse-finish" ".*main\.2.*"