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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 475bdd8700802ec1f2f6142e0f35157734a06640..1146ce8f1373752ef455cbe90ddc7c9b170dcb55 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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  <hongjiu.lu@intel.com>
 
        * 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 026f956df9f13712dcd068e1c356ebeebf1f6ba4..907eb95e24e00c556fc60250683865ed88b685dd 100644 (file)
--- 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 cf41c572789274f997c264fd86aa16414e6044b1..52731f720f1757e470c6961f90709a6d95c95b06 100644 (file)
--- 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 8a51be5f21901143acb91793d873884ec8b83738..bf7f985dfe3aa0a9a027be5cbbc233eeb94cfe84 100644 (file)
--- 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 d7b41cc3155ee76470f69981bbd8bf05f335339f..f603fc51f6d716bc91c05e5b8587bf8e898a0356 100644 (file)
--- 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 2e724aa77e0c6ce7723b4832c5f614d714865c8a..b48952f1c8556b2c1e78e2cef98b9f71b65206d1 100644 (file)
--- 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 23cbabc862e187bd85930a9d6232ee7b785b7780..67d5db1af434269541e19c59c1b0be8e59898146 100644 (file)
--- 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 241d939fade60c5245df5750023631c0ec53ff5c..0f0b1d8dcb889d454720f2fff4fa3107df4ee620 100644 (file)
--- 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 4ae59434853dc005566cecf03e89afdb9b0eaf38..89fcbc99f7b0a6b4cab2c5c2f0e37841fafa2d58 100644 (file)
--- 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
 }