From b972bd9c133c8acd3f5ce8d05a4fdfc85aee2c15 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 23 Jun 2014 08:24:36 +0200 Subject: [PATCH] testsuite: Use istarget and is_lp64_target for 3 testcases. On x86_64 with -m32 or on i686 it will: Running ./gdb.arch/amd64-stap-special-operands.exp ... gdb compile failed, amd64-stap-triplet.c: Assembler messages: amd64-stap-triplet.c:35: Error: bad register name `%rbp' amd64-stap-triplet.c:38: Error: bad register name `%rsp' amd64-stap-triplet.c:40: Error: bad register name `%rbp)' amd64-stap-triplet.c:41: Error: bad register name `%rsi' amd64-stap-triplet.c:42: Error: bad register name `%rbp)' /tmp/ccjOdmpl.s:63: Error: bad register name `%rbp' 2014-06-23 Jan Kratochvil * gdb.arch/amd64-stap-special-operands.exp: Use is_lp64_target. * gdb.arch/amd64-stap-optional-prefix.exp: Likewise. * gdb.dwarf2/dw2-error.exp: Use istarget and is_lp64_target. Message-ID: <20140622211401.GA3716@host2.jankratochvil.net> --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp | 2 +- gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-error.exp | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1e7ef7f..93cd6f6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-06-23 Jan Kratochvil + + * gdb.arch/amd64-stap-special-operands.exp: Use is_lp64_target. + * gdb.arch/amd64-stap-optional-prefix.exp: Likewise. + * gdb.dwarf2/dw2-error.exp: Use istarget and is_lp64_target. + 2014-06-20 Gary Benson * gdb.arch/i386-avx.exp: Fix include file location. diff --git a/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp b/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp index b7f1505..10d3e70 100644 --- a/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp +++ b/gdb/testsuite/gdb.arch/amd64-stap-optional-prefix.exp @@ -17,7 +17,7 @@ standard_testfile ".S" -if { ![istarget "x86_64-*-*"] } { +if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } { verbose "Skipping $testfile.exp" return } diff --git a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp index a6ce7f5..988b5d6 100644 --- a/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp +++ b/gdb/testsuite/gdb.arch/amd64-stap-special-operands.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"] } { +if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } { verbose "Skipping amd64-stap-special-operands.exp" return } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp index 65eac6d..b6cd205 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp @@ -22,6 +22,11 @@ if {![dwarf2_support]} { standard_testfile .S +if { ![istarget "x86_64-*-*"] || ![is_lp64_target] } { + verbose "Skipping $testfile.exp" + return +} + # We can't use prepare_for_testing here because we need to check the # 'file' command's output. if {[build_executable $testfile.exp $testfile $srcfile {nodebug}]} { -- 2.7.4