[25/46] Use require is_aarch64_target

Message ID 20221217000818.3729389-26-tom@tromey.com
State Committed
Headers
Series Rewrite "require" test procedure and use it more often |

Commit Message

Tom Tromey Dec. 17, 2022, 12:07 a.m. UTC
  This changes some tests to use "require is_aarch64_target".
---
 gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp     | 5 +----
 gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp    | 5 +----
 gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp  | 5 +----
 gdb/testsuite/gdb.arch/aarch64-fp.exp              | 5 +----
 gdb/testsuite/gdb.arch/aarch64-mte-core.exp        | 5 +----
 gdb/testsuite/gdb.arch/aarch64-mte.exp             | 5 +----
 gdb/testsuite/gdb.arch/aarch64-pauth.exp           | 5 +----
 gdb/testsuite/gdb.arch/aarch64-prologue.exp        | 5 +----
 gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp | 5 +----
 gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp  | 5 +----
 gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp       | 5 +----
 gdb/testsuite/gdb.arch/aarch64-w-registers.exp     | 5 +----
 12 files changed, 12 insertions(+), 48 deletions(-)
  

Comments

Luis Machado Dec. 19, 2022, 10:46 a.m. UTC | #1
On 12/17/22 00:07, Tom Tromey wrote:
> This changes some tests to use "require is_aarch64_target".
> ---
>   gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp     | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp    | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp  | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-fp.exp              | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-mte-core.exp        | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-mte.exp             | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-pauth.exp           | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-prologue.exp        | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp  | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp       | 5 +----
>   gdb/testsuite/gdb.arch/aarch64-w-registers.exp     | 5 +----
>   12 files changed, 12 insertions(+), 48 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
> index 18843d341e1..a72210ffa68 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
> @@ -18,10 +18,7 @@
>   # Test single stepping through atomic sequences beginning with
>   # a ldxr instruction and ending with a stxr instruction.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
> index f4ecc554379..9e1f7d6f8a6 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
> @@ -18,10 +18,7 @@
>   # Test if GDB stops at various BRK instruction patterns inserted into
>   # the code.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp b/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp
> index add1234e606..f8606e219ad 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp
> @@ -21,10 +21,7 @@
>   #
>   # See PR breakpoints/21870.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile .c
>   
> diff --git a/gdb/testsuite/gdb.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp
> index 41c162b4d50..48c39951e4f 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-fp.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp
> @@ -18,10 +18,7 @@
>   # PR server/17457
>   # Test aarch64 floating point registers q0, q1, v0, v1, fpsr, fpcr
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-mte-core.exp b/gdb/testsuite/gdb.arch/aarch64-mte-core.exp
> index 904364d027c..5ebc6d7d1ee 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-mte-core.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-mte-core.exp
> @@ -164,10 +164,7 @@ proc test_mode { mode } {
>   
>   }
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   # Run tests
>   foreach_with_prefix mode {"sync" "async"} {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-mte.exp b/gdb/testsuite/gdb.arch/aarch64-mte.exp
> index 4aaf1844f24..a4a8a20d8aa 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-mte.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-mte.exp
> @@ -43,10 +43,7 @@ proc get_ltag_from_ptr { ptr } {
>   		      "fetch tag from pointer ${ptr}"]
>   }
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
> index 901eb8212c9..54bf16c5f67 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-pauth.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
> @@ -17,10 +17,7 @@
>   # supports pauth instructions.  On non pauth systems, all pauth instructions
>   # are treated as nops.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   # Build program with address signing forced on.
>   standard_testfile
> diff --git a/gdb/testsuite/gdb.arch/aarch64-prologue.exp b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
> index d17dc668873..588bc269336 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-prologue.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
> @@ -15,10 +15,7 @@
>   
>   # This file is part of the gdb testsuite.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return 1
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
> index 7cb3adad076..1175e8d6b4f 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
> @@ -15,10 +15,7 @@
>   #
>   # This file is part of the gdb testsuite.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return -1
> -}
> +require is_aarch64_target
>   
>   set compile_flags {debug}
>   
> diff --git a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
> index 6e94a8fc11a..8faf92bee8d 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
> @@ -15,10 +15,7 @@
>   #
>   # This file is part of the gdb testsuite.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
> diff --git a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
> index a6d549a9830..9e9613aa3f9 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
> @@ -17,10 +17,7 @@
>   
>   # Test explicitly unwinding the PC DWARF register on aarch64
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile .S
>   
> diff --git a/gdb/testsuite/gdb.arch/aarch64-w-registers.exp b/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
> index 72711fe660f..7e4fc24c3cb 100644
> --- a/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
> +++ b/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
> @@ -16,10 +16,7 @@
>   # Check if the W registers have the expected size and if setting/fetching
>   # values from W registers works correctly for both big and little endian.
>   
> -if {![is_aarch64_target]} {
> -    verbose "Skipping ${gdb_test_file_name}."
> -    return
> -}
> +require is_aarch64_target
>   
>   standard_testfile
>   if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {

LGTM.
  

Patch

diff --git a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
index 18843d341e1..a72210ffa68 100644
--- a/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-atomic-inst.exp
@@ -18,10 +18,7 @@ 
 # Test single stepping through atomic sequences beginning with
 # a ldxr instruction and ending with a stxr instruction.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
diff --git a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
index f4ecc554379..9e1f7d6f8a6 100644
--- a/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-brk-patterns.exp
@@ -18,10 +18,7 @@ 
 # Test if GDB stops at various BRK instruction patterns inserted into
 # the code.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile
 if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
diff --git a/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp b/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp
index add1234e606..f8606e219ad 100644
--- a/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-dbreg-contents.exp
@@ -21,10 +21,7 @@ 
 #
 # See PR breakpoints/21870.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile .c
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-fp.exp b/gdb/testsuite/gdb.arch/aarch64-fp.exp
index 41c162b4d50..48c39951e4f 100644
--- a/gdb/testsuite/gdb.arch/aarch64-fp.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-fp.exp
@@ -18,10 +18,7 @@ 
 # PR server/17457
 # Test aarch64 floating point registers q0, q1, v0, v1, fpsr, fpcr
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
diff --git a/gdb/testsuite/gdb.arch/aarch64-mte-core.exp b/gdb/testsuite/gdb.arch/aarch64-mte-core.exp
index 904364d027c..5ebc6d7d1ee 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mte-core.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-mte-core.exp
@@ -164,10 +164,7 @@  proc test_mode { mode } {
 
 }
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 # Run tests
 foreach_with_prefix mode {"sync" "async"} {
diff --git a/gdb/testsuite/gdb.arch/aarch64-mte.exp b/gdb/testsuite/gdb.arch/aarch64-mte.exp
index 4aaf1844f24..a4a8a20d8aa 100644
--- a/gdb/testsuite/gdb.arch/aarch64-mte.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-mte.exp
@@ -43,10 +43,7 @@  proc get_ltag_from_ptr { ptr } {
 		      "fetch tag from pointer ${ptr}"]
 }
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
diff --git a/gdb/testsuite/gdb.arch/aarch64-pauth.exp b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
index 901eb8212c9..54bf16c5f67 100644
--- a/gdb/testsuite/gdb.arch/aarch64-pauth.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-pauth.exp
@@ -17,10 +17,7 @@ 
 # supports pauth instructions.  On non pauth systems, all pauth instructions
 # are treated as nops.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 # Build program with address signing forced on.
 standard_testfile
diff --git a/gdb/testsuite/gdb.arch/aarch64-prologue.exp b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
index d17dc668873..588bc269336 100644
--- a/gdb/testsuite/gdb.arch/aarch64-prologue.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-prologue.exp
@@ -15,10 +15,7 @@ 
 
 # This file is part of the gdb testsuite.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return 1
-}
+require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
diff --git a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
index 7cb3adad076..1175e8d6b4f 100644
--- a/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-sighandler-regs.exp
@@ -15,10 +15,7 @@ 
 #
 # This file is part of the gdb testsuite.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return -1
-}
+require is_aarch64_target
 
 set compile_flags {debug}
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
index 6e94a8fc11a..8faf92bee8d 100644
--- a/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-tagged-pointer.exp
@@ -15,10 +15,7 @@ 
 #
 # This file is part of the gdb testsuite.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
diff --git a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
index a6d549a9830..9e9613aa3f9 100644
--- a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
@@ -17,10 +17,7 @@ 
 
 # Test explicitly unwinding the PC DWARF register on aarch64
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile .S
 
diff --git a/gdb/testsuite/gdb.arch/aarch64-w-registers.exp b/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
index 72711fe660f..7e4fc24c3cb 100644
--- a/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-w-registers.exp
@@ -16,10 +16,7 @@ 
 # Check if the W registers have the expected size and if setting/fetching
 # values from W registers works correctly for both big and little endian.
 
-if {![is_aarch64_target]} {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch64_target
 
 standard_testfile
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {