btrace, testsuite: fix assembly source file selection

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.

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.
This commit is contained in:
Markus Metzger 2016-07-22 13:41:45 +02:00
parent 698f8cbbbb
commit e0461dbb65
5 changed files with 42 additions and 18 deletions

View File

@ -1,3 +1,14 @@
2016-07-26 Markus Metzger <markus.t.metzger@intel.com>
* gdb.btrace/record_goto.exp: se is_amd64_regs_target for
selecting assembly source files.
* gdb.btrace/stepi.exp: se is_amd64_regs_target for selecting
assembly source files.
* gdb.btrace/tailcall.exp: se is_amd64_regs_target for selecting
assembly source files.
* gdb.btrace/tailcall-only.exp: se is_amd64_regs_target for
selecting assembly source files.
2016-07-25 Simon Marchi <simon.marchi@ericsson.com>
* gdb.base/new-ui.exp (do_test_invalid_args): New

View File

@ -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

View File

@ -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

View File

@ -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] {

View File

@ -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] {