Fix more cases of improper test names

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.btrace / record_goto.exp

diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
index f4096e0f4533374f6af30eddb1741ef3d1b6c911..ea4cf694a2d4f875dc02316988aca8ccc4ca5f77 100644 (file)
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -1,6 +1,6 @@
 # This testcase is part of GDB, the GNU debugger.
 #
-# Copyright 2013-2015 Free Software Foundation, Inc.
+# Copyright 2013-2016 Free Software Foundation, Inc.
 #
 # Contributed by Intel Corp. <markus.t.metzger@intel.com>
 #
@@ -33,16 +33,18 @@ if [info exists COMPILE] {
     # make check RUNTESTFLAGS="gdb.btrace/record_goto.exp COMPILE=1"
     standard_testfile record_goto.c
     lappend opts debug
-} elseif {[istarget "x86_64-*-*"]} {
-       standard_testfile x86_64-record_goto.S
-} elseif {[istarget "i?86-*-*"]} {
-       standard_testfile i686-record_goto.S
+} elseif {[istarget "i?86-*-*"] || [istarget "x86_64-*-*"]} {
+       if {[is_amd64_regs_target]} {
+               standard_testfile x86_64-record_goto.S
+       } else {
+               standard_testfile i686-record_goto.S
+       }
 } else {
     verbose "Skipping ${testfile}."
     return -1
 }
 
-if [prepare_for_testing record_goto.exp $testfile $srcfile $opts] {
+if [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] {
     return -1
 }
 if ![runto_main] {