From: Markus Metzger <markus.t.metzger@intel.com>
To: gdb-patches@sourceware.org
Cc: palves@redhat.com, jan.kratochvil@redhat.com
Subject: [PATCH] btrace, testsuite: fix assembly source file selection
Date: Tue, 26 Jul 2016 07:39:00 -0000 [thread overview]
Message-ID: <1469516752-32313-1-git-send-email-markus.t.metzger@intel.com> (raw)
Some btrace tests use assembly source files. They use the target triplet to
distinguish between x86_64 and ia32 ISA. This does not work for -m32 tests
without setting the target triplet to i686-?-?.
Instead use is_amd64_regs_target to distinguish between x86_64 and ia32 ISA.
See also https://sourceware.org/ml/gdb-patches/2016-07/msg00256.html.
2016-07-26 Markus Metzger <markus.t.metzger@intel.com>
testsuite/
* gdb.btrace/record_goto.exp: Use is_amd64_regs_target for selecting
assembly source files.
* gdb.btrace/stepi.exp: Use is_amd64_regs_target for selecting
assembly source files.
* gdb.btrace/tailcall.exp: Use is_amd64_regs_target for selecting
assembly source files.
* gdb.btrace/tailcall-only.exp: Use is_amd64_regs_target for selecting
assembly source files.
---
gdb/testsuite/gdb.btrace/record_goto.exp | 10 ++++++----
gdb/testsuite/gdb.btrace/stepi.exp | 17 ++++++++++++-----
gdb/testsuite/gdb.btrace/tailcall-only.exp | 10 ++++++----
gdb/testsuite/gdb.btrace/tailcall.exp | 12 +++++++-----
4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/gdb/testsuite/gdb.btrace/record_goto.exp b/gdb/testsuite/gdb.btrace/record_goto.exp
index 50b259a..7df33bc 100644
--- a/gdb/testsuite/gdb.btrace/record_goto.exp
+++ b/gdb/testsuite/gdb.btrace/record_goto.exp
@@ -33,10 +33,12 @@ 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
diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
index 3aff8cb..b21e4e5 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -27,12 +27,19 @@ if { [skip_btrace_tests] } { return -1 }
#
# Luckily, they are similar enough that a single test script can handle
# both.
-if {[istarget "x86_64-*-*"]} {
- standard_testfile x86_64-record_goto.S
-} elseif {[istarget "i?86-*-*"]} {
- standard_testfile i686-record_goto.S
+if [info exists COMPILE] {
+ # make check RUNTESTFLAGS="gdb.btrace/stepi.exp COMPILE=1"
+ standard_testfile record_goto.c
+ lappend opts debug
+} 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 {
- return -1
+ verbose "Skipping ${testfile}."
+ return -1
}
# start inferior
diff --git a/gdb/testsuite/gdb.btrace/tailcall-only.exp b/gdb/testsuite/gdb.btrace/tailcall-only.exp
index 50837bf..494e2e8 100644
--- a/gdb/testsuite/gdb.btrace/tailcall-only.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall-only.exp
@@ -35,13 +35,15 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.btrace/tailcall-only.exp COMPILE=1"
standard_testfile tailcall-only.c
lappend opts debug optimize=-O2
-} elseif {[istarget "x86_64-*-*"] && [is_lp64_target]} {
- standard_testfile x86_64-tailcall-only.S
} elseif {[istarget "i?86-*-*"] || [istarget "x86_64-*-*"]} {
- standard_testfile i686-tailcall-only.S
+ if {[is_amd64_regs_target]} {
+ standard_testfile x86_64-tailcall-only.S
+ } else {
+ standard_testfile i686-tailcall-only.S
+ }
} else {
verbose "Skipping ${testfile}."
- return
+ return -1
}
if [prepare_for_testing tailcall-only.exp $testfile $srcfile $opts] {
diff --git a/gdb/testsuite/gdb.btrace/tailcall.exp b/gdb/testsuite/gdb.btrace/tailcall.exp
index 22704c7..bc8afc4 100644
--- a/gdb/testsuite/gdb.btrace/tailcall.exp
+++ b/gdb/testsuite/gdb.btrace/tailcall.exp
@@ -32,13 +32,15 @@ if [info exists COMPILE] {
# make check RUNTESTFLAGS="gdb.btrace/tailcall.exp COMPILE=1"
standard_testfile tailcall.c
lappend opts debug optimize=-O2
-} elseif {[istarget "x86_64-*-*"]} {
- standard_testfile x86_64-tailcall.S
-} elseif {[istarget "i?86-*-*"]} {
- standard_testfile i686-tailcall.S
+} elseif {[istarget "i?86-*-*"] || [istarget "x86_64-*-*"]} {
+ if {[is_amd64_regs_target]} {
+ standard_testfile x86_64-tailcall.S
+ } else {
+ standard_testfile i686-tailcall.S
+ }
} else {
verbose "Skipping ${testfile}."
- return
+ return -1
}
if [prepare_for_testing tailcall.exp $testfile $srcfile $opts] {
--
1.8.3.1
next reply other threads:[~2016-07-26 7:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-26 7:39 Markus Metzger [this message]
2016-07-26 8:41 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469516752-32313-1-git-send-email-markus.t.metzger@intel.com \
--to=markus.t.metzger@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=jan.kratochvil@redhat.com \
--cc=palves@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox