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, 0 insertions, 60 deletions

diff --git a/gdb/testsuite/gdb.btrace/finish.exp b/gdb/testsuite/gdb.btrace/finish.exp
deleted file mode 100644
index 6881e3b..0000000
--- a/gdb/testsuite/gdb.btrace/finish.exp
+++ /dev/null
@@ -1,60 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-#
-# Copyright 2013-2015 Free Software Foundation, Inc.
-#
-# Contributed by Intel Corp. <markus.t.metzger@intel.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# check for btrace support
-if { [skip_btrace_tests] } { return -1 }
-
-# start inferior
-standard_testfile x86-record_goto.S
-if [prepare_for_testing finish.exp $testfile $srcfile] {
-    return -1
-}
-
-if ![runto_main] {
-    return -1
-}
-
-# trace the call to the test function
-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 go somewhere where we can finish
-gdb_test "record goto 32" ".*fun1\.1.*"
-with_test_prefix "at 32" { check_replay_at 32 }
-
-gdb_test "finish" ".*fun2\.3.*"
-with_test_prefix "finish into fun2" { check_replay_at 35 }
-
-gdb_test "reverse-finish" ".*fun3\.3.*"
-with_test_prefix "reverse-finish into fun3" { check_replay_at 27 }
-
-gdb_test "finish" ".*fun4\.5.*"
-with_test_prefix "finish into fun4" { check_replay_at 39 }
-
-gdb_test "reverse-finish" ".*main\.2.*"
-with_test_prefix "reverse-finish into main" { check_replay_at 1 }