From 11fc905705c6bd2c7473138e3623ebf39f5bf1b3 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 11 Oct 2012 17:42:58 +0000 Subject: [PATCH] Use is_x86_like_target to check x86 targets * gdb.arch/i386-bp_permanent.exp: Skip if not is_x86_like_target. * gdb.arch/i386-cfi-notcurrent.exp: Likewise. * gdb.arch/i386-disp-step.exp: Likewise. * gdb.arch/i386-gnu-cfi.exp: Likewise. * gdb.arch/i386-prologue.exp: Likewise. * gdb.arch/i386-size-overlap.exp: Likewise. * gdb.arch/i386-size.exp: Likewise. * gdb.arch/i386-unwind.exp: Likewise. --- gdb/testsuite/ChangeLog | 11 +++++++++++ gdb/testsuite/gdb.arch/i386-bp_permanent.exp | 2 +- gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp | 2 +- gdb/testsuite/gdb.arch/i386-disp-step.exp | 2 +- gdb/testsuite/gdb.arch/i386-gnu-cfi.exp | 2 +- gdb/testsuite/gdb.arch/i386-prologue.exp | 2 +- gdb/testsuite/gdb.arch/i386-size-overlap.exp | 2 +- gdb/testsuite/gdb.arch/i386-size.exp | 2 +- gdb/testsuite/gdb.arch/i386-unwind.exp | 2 +- 9 files changed, 19 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 475bdd87008..1146ce8f137 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2012-10-11 H.J. Lu + + * gdb.arch/i386-bp_permanent.exp: Skip if not is_x86_like_target. + * gdb.arch/i386-cfi-notcurrent.exp: Likewise. + * gdb.arch/i386-disp-step.exp: Likewise. + * gdb.arch/i386-gnu-cfi.exp: Likewise. + * gdb.arch/i386-prologue.exp: Likewise. + * gdb.arch/i386-size-overlap.exp: Likewise. + * gdb.arch/i386-size.exp: Likewise. + * gdb.arch/i386-unwind.exp: Likewise. + 2012-10-11 H.J. Lu * gdb.arch/i386-byte.exp: Remove is_ilp32_target check. diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp index 026f956df9f..907eb95e24e 100644 --- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp +++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp @@ -18,7 +18,7 @@ # Test stepping over permanent breakpoints on i386. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping skip over permanent breakpoint on i386 tests." return } diff --git a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp index cf41c572789..52731f720f1 100644 --- a/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp +++ b/gdb/testsuite/gdb.arch/i386-cfi-notcurrent.exp @@ -16,7 +16,7 @@ # [RFA] DWARF frame unwinder executes one too many rows # http://sourceware.org/ml/gdb-patches/2012-07/msg00650.html -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } { +if { ![is_x86_like_target] } { return 0 } diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp index 8a51be5f219..bf7f985dfe3 100644 --- a/gdb/testsuite/gdb.arch/i386-disp-step.exp +++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp @@ -18,7 +18,7 @@ # Test i386 displaced stepping. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping x86 displaced stepping tests." return } diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp index d7b41cc3155..f603fc51f6d 100644 --- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp +++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp @@ -23,7 +23,7 @@ # Test i386 unwinder. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping i386 unwinder tests." return } diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp index 2e724aa77e0..b48952f1c85 100644 --- a/gdb/testsuite/gdb.arch/i386-prologue.exp +++ b/gdb/testsuite/gdb.arch/i386-prologue.exp @@ -21,7 +21,7 @@ # Test i386 prologue analyzer. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping i386 prologue tests." return } diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp index 23cbabc862e..67d5db1af43 100644 --- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp +++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp @@ -17,7 +17,7 @@ # Test that GDB can handle overlapping sizes of symbols. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping i386 unwinder tests." return } diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp index 241d939fade..0f0b1d8dcb8 100644 --- a/gdb/testsuite/gdb.arch/i386-size.exp +++ b/gdb/testsuite/gdb.arch/i386-size.exp @@ -20,7 +20,7 @@ # Test that GDB can see the sizes of symbols. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping i386 unwinder tests." return } diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp index 4ae59434853..89fcbc99f7b 100644 --- a/gdb/testsuite/gdb.arch/i386-unwind.exp +++ b/gdb/testsuite/gdb.arch/i386-unwind.exp @@ -21,7 +21,7 @@ # Test i386 unwinder. -if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then { +if { ![is_x86_like_target] } then { verbose "Skipping i386 unwinder tests." return } -- 2.30.2