diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.btrace/record_goto.exp | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.btrace/stepi.exp | 17 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.btrace/tailcall-only.exp | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.btrace/tailcall.exp | 12 |
5 files changed, 42 insertions, 18 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 609d262..aa7aa28 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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 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] { |