[v2,9/9] Move target check into allow_altivec_tests

Message ID 20230124230243.2471957-10-tom@tromey.com
State Committed
Headers
Series Use 'require' even more |

Commit Message

Tom Tromey Jan. 24, 2023, 11:02 p.m. UTC
  Pedro pointed out that only PPC can possibly have altivec, so we can
move the target check into allow_altivec_tests.
---
 gdb/testsuite/gdb.arch/altivec-abi.exp         | 1 -
 gdb/testsuite/gdb.arch/altivec-regs.exp        | 1 -
 gdb/testsuite/gdb.arch/powerpc-vector-regs.exp | 2 +-
 gdb/testsuite/lib/gdb.exp                      | 5 +++++
 4 files changed, 6 insertions(+), 3 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
index 2cc75d4d617..b04858950e8 100644
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
@@ -22,7 +22,6 @@ 
 #
 
 require allow_altivec_tests
-require {istarget "powerpc*"}
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index 315ce1acfb2..6cc32aeff22 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -22,7 +22,6 @@ 
 #
 
 require allow_altivec_tests
-require {istarget "powerpc*"}
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-vector-regs.exp b/gdb/testsuite/gdb.arch/powerpc-vector-regs.exp
index 2447d740624..2958af019cb 100644
--- a/gdb/testsuite/gdb.arch/powerpc-vector-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-vector-regs.exp
@@ -20,7 +20,7 @@ 
 # 0 to 31 in each of the 16 bytes of each corresponding register, and
 # we then check if gdb sees these same values.
 
-require allow_altivec_tests {[istarget "powerpc*"}
+require allow_altivec_tests
 
 standard_testfile
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index d30340e1df1..e2af5a252b7 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3471,6 +3471,11 @@  gdb_caching_proc allow_altivec_tests {
 	return 0
     }
 
+    if {![istarget powerpc*]} {
+	verbose "$me: PPC target required, returning 0" 2
+	return 0
+    }
+
     # Make sure we have a compiler that understands altivec.
     if [test_compiler_info gcc*] {
         set compile_flags "additional_flags=-maltivec"