[v2,26/79] Use require is_aarch32_target

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

Commit Message

Tom Tromey Jan. 12, 2023, 2:59 a.m. UTC
  This changes some tests to use "require is_aarch32_target".
---
 gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp            | 5 +----
 gdb/testsuite/gdb.arch/arm-disp-step.exp                 | 5 +----
 gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp | 5 +----
 gdb/testsuite/gdb.arch/pr25124.exp                       | 5 +----
 gdb/testsuite/gdb.arch/thumb-bx-pc.exp                   | 5 +----
 gdb/testsuite/gdb.arch/thumb-prologue.exp                | 5 +----
 gdb/testsuite/gdb.arch/thumb-singlestep.exp              | 5 +----
 7 files changed, 7 insertions(+), 28 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp
index dff9b115ac9..f2de30031a5 100644
--- a/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp
+++ b/gdb/testsuite/gdb.arch/arm-bl-branch-dest.exp
@@ -13,10 +13,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { ![is_aarch32_target] } {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch32_target
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index 2917e9fd12f..e9106cf17b7 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -17,10 +17,7 @@ 
 
 # Test arm displaced stepping.
 
-if {![is_aarch32_target]} {
-    verbose "Skipping arm displaced stepping tests."
-    return
-}
+require is_aarch32_target
 
 standard_testfile .S
 
diff --git a/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp b/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp
index 37f0790b65f..af33ac61b37 100644
--- a/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp
+++ b/gdb/testsuite/gdb.arch/arm-single-step-kernel-helper.exp
@@ -13,10 +13,7 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { ![is_aarch32_target] } {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require is_aarch32_target
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.arch/pr25124.exp b/gdb/testsuite/gdb.arch/pr25124.exp
index 6cc7ec41220..45033771d79 100644
--- a/gdb/testsuite/gdb.arch/pr25124.exp
+++ b/gdb/testsuite/gdb.arch/pr25124.exp
@@ -16,10 +16,7 @@ 
 # Test proper disassembling of ARM thumb instructions when reloading a symbol
 # file.
 
-if {![is_aarch32_target]} {
-    verbose "Skipping ARM tests."
-    return
-}
+require is_aarch32_target
 
 standard_testfile .S
 
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index ae08e9e3a87..9a46f11b89a 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -15,10 +15,7 @@ 
 
 # Test PC adjustment from Thumb-mode "bx pc" instruction.
 
-if {![is_aarch32_target]} {
-    verbose "Skipping ARM tests."
-    return
-}
+require is_aarch32_target
 
 set testfile "thumb-bx-pc"
 set srcfile ${testfile}.S
diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp
index 095c9d58de7..1d74a30905a 100644
--- a/gdb/testsuite/gdb.arch/thumb-prologue.exp
+++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp
@@ -15,10 +15,7 @@ 
 
 # Test ARM/Thumb prologue analyzer.
 
-if {![is_aarch32_target]} {
-    verbose "Skipping ARM prologue tests."
-    return
-}
+require is_aarch32_target
 
 standard_testfile
 
diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
index 375dade3d72..2d4e28dd31a 100644
--- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp
+++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
@@ -15,10 +15,7 @@ 
 
 # Test single-stepping into incorrectly marked Thumb routine
 
-if {![is_aarch32_target]} {
-    verbose "Skipping ARM tests."
-    return
-}
+require is_aarch32_target
 
 set testfile "thumb-singlestep"
 set srcfile ${testfile}.S