[v2,11/79] Use require skip_stl_tests

Message ID 20230112030052.3306113-12-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 skip_stl_tests".
---
 gdb/testsuite/gdb.cp/bs15503.exp      | 2 +-
 gdb/testsuite/gdb.cp/exception.exp    | 2 +-
 gdb/testsuite/gdb.cp/mb-templates.exp | 2 +-
 gdb/testsuite/gdb.cp/try_catch.exp    | 2 +-
 gdb/testsuite/gdb.cp/userdef.exp      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.cp/bs15503.exp b/gdb/testsuite/gdb.cp/bs15503.exp
index 9e80e9b74c0..870d36d29b4 100644
--- a/gdb/testsuite/gdb.cp/bs15503.exp
+++ b/gdb/testsuite/gdb.cp/bs15503.exp
@@ -17,7 +17,7 @@ 
 # This file was written by Sue Kimura (sue_kimura@hp.com)
 # Rewritten by Michael Chastain (mec.gnu@mindspring.com)
 
-if { [skip_stl_tests] } { return }
+require !skip_stl_tests
 
 standard_testfile .cc
 
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
index 3df6e7bce43..3b47143277e 100644
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ b/gdb/testsuite/gdb.cp/exception.exp
@@ -33,7 +33,7 @@ 
 set ws	"\[\r\n\t \]+"
 set nl	"\[\r\n\]+"
 
-if { [skip_stl_tests] } { return }
+require !skip_stl_tests
 
 standard_testfile .cc
  
diff --git a/gdb/testsuite/gdb.cp/mb-templates.exp b/gdb/testsuite/gdb.cp/mb-templates.exp
index d4e7d3925ba..17f9e8102cd 100644
--- a/gdb/testsuite/gdb.cp/mb-templates.exp
+++ b/gdb/testsuite/gdb.cp/mb-templates.exp
@@ -16,7 +16,7 @@ 
 # This test verifies that setting breakpoint on line in template
 # function will fire in all instantiations of that template.
 
-if { [skip_stl_tests] } { continue }
+require !skip_stl_tests
 
 
 standard_testfile .cc
diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
index f1d372b0b69..9dd7eecbfe3 100644
--- a/gdb/testsuite/gdb.cp/try_catch.exp
+++ b/gdb/testsuite/gdb.cp/try_catch.exp
@@ -18,7 +18,7 @@ 
 
 # This file is part of the gdb testsuite
 
-if { [skip_stl_tests] } { return }
+require !skip_stl_tests
 
 #
 # test running programs
diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
index fbe1bc7d3f9..1ab609bd480 100644
--- a/gdb/testsuite/gdb.cp/userdef.exp
+++ b/gdb/testsuite/gdb.cp/userdef.exp
@@ -19,7 +19,7 @@ 
 # source file "userdef.cc"
 #
 
-if { [skip_stl_tests] } { return }
+require !skip_stl_tests
 
 standard_testfile .cc