[v2,59/79] Rename to allow_ctf_tests

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

Commit Message

Tom Tromey Jan. 12, 2023, 3 a.m. UTC
  This changes skip_ctf_tests to invert the sense, and renames it to
allow_ctf_tests.
---
 gdb/testsuite/gdb.base/ctf-constvars.exp  | 2 +-
 gdb/testsuite/gdb.base/ctf-ptype.exp      | 2 +-
 gdb/testsuite/gdb.base/cvexpr.exp         | 2 +-
 gdb/testsuite/gdb.base/whatis.exp         | 2 +-
 gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp | 2 +-
 gdb/testsuite/gdb.ctf/funcreturn.exp      | 2 +-
 gdb/testsuite/gdb.ctf/multi.exp           | 2 +-
 gdb/testsuite/lib/gdb.exp                 | 6 +++---
 8 files changed, 10 insertions(+), 10 deletions(-)
  

Patch

diff --git a/gdb/testsuite/gdb.base/ctf-constvars.exp b/gdb/testsuite/gdb.base/ctf-constvars.exp
index 7737401bbab..7b3c0f69da8 100644
--- a/gdb/testsuite/gdb.base/ctf-constvars.exp
+++ b/gdb/testsuite/gdb.base/ctf-constvars.exp
@@ -24,7 +24,7 @@ 
 #            const pointers to const vars
 # with mixed types.
 
-require !skip_ctf_tests
+require allow_ctf_tests
 
 standard_testfile .c
 
diff --git a/gdb/testsuite/gdb.base/ctf-ptype.exp b/gdb/testsuite/gdb.base/ctf-ptype.exp
index 4010cf4e15e..4a81993628e 100644
--- a/gdb/testsuite/gdb.base/ctf-ptype.exp
+++ b/gdb/testsuite/gdb.base/ctf-ptype.exp
@@ -15,7 +15,7 @@ 
 
 # This file is a subset of ptype.exp written by Rob Savoye. (rob@cygnus.com)
 
-require !skip_ctf_tests
+require allow_ctf_tests
 
 # Some tests require GCC.
 set gcc_compiled [is_c_compiler_gcc]
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 3d78936350a..bbaa7d4983b 100644
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -497,7 +497,7 @@  lappend ctf_opts ldflags=-Wl,--strip-debug
 
 # Build up the set of debug formats for which we will run this test.
 set specs { {dwarf {debug}} }
-if ![skip_ctf_tests] {
+if {[allow_ctf_tests]} {
     lappend specs [list ctf $ctf_opts]
 }
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 2da9aecc600..3736e78bbdc 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -592,7 +592,7 @@  lappend ctf_opts ldflags=-Wl,--ctf-variables
 
 # Build up the set of debug formats for which we will run this test.
 set specs { {dwarf {debug}} }
-if ![skip_ctf_tests] {
+if {[allow_ctf_tests]} {
     lappend specs [list ctf $ctf_opts]
 }
 
diff --git a/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp b/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
index 4ce178af2c0..0292e394646 100644
--- a/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
+++ b/gdb/testsuite/gdb.ctf/cross-tu-cyclic.exp
@@ -15,7 +15,7 @@ 
 
 # This file is a subset of ptype.exp written by Rob Savoye. (rob@cygnus.com)
 
-require !skip_ctf_tests
+require allow_ctf_tests
 
 standard_testfile cross-tu-cyclic-1.c  cross-tu-cyclic-2.c \
 	cross-tu-cyclic-3.c  cross-tu-cyclic-4.c
diff --git a/gdb/testsuite/gdb.ctf/funcreturn.exp b/gdb/testsuite/gdb.ctf/funcreturn.exp
index a65a1cbf7ad..64ed031f693 100644
--- a/gdb/testsuite/gdb.ctf/funcreturn.exp
+++ b/gdb/testsuite/gdb.ctf/funcreturn.exp
@@ -13,7 +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/>.
 
-require !skip_ctf_tests
+require allow_ctf_tests
 
 if [target_info exists no_long_long] {
     set exec_opts [list debug additional_flags=-DNO_LONG_LONG]
diff --git a/gdb/testsuite/gdb.ctf/multi.exp b/gdb/testsuite/gdb.ctf/multi.exp
index 0afbdc5a6ab..c82d1b952e3 100644
--- a/gdb/testsuite/gdb.ctf/multi.exp
+++ b/gdb/testsuite/gdb.ctf/multi.exp
@@ -15,7 +15,7 @@ 
 
 # This file is a subset of ptype.exp written by Rob Savoye. (rob@cygnus.com)
 
-require !skip_ctf_tests
+require allow_ctf_tests
 
 standard_testfile ctf-a.c ctf-b.c ctf-c.c
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index b1d0e7aefdf..e2feebfab8f 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -8522,11 +8522,11 @@  proc cmp_binary_files { file1 file2 } {
 # flag?  If not then we should skip these tests.  We should also
 # skip them if libctf was explicitly disabled.
 
-gdb_caching_proc skip_ctf_tests {
+gdb_caching_proc allow_ctf_tests {
     global enable_libctf
 
     if {$enable_libctf eq "no"} {
-	return 1
+	return 0
     }
 
     set can_ctf [gdb_can_simple_compile ctfdebug {
@@ -8535,7 +8535,7 @@  gdb_caching_proc skip_ctf_tests {
 	}
     } executable "additional_flags=-gctf"]
 
-    return [expr {!$can_ctf}]
+    return $can_ctf
 }
 
 # Return 1 if compiler supports -gstatement-frontiers.  Otherwise,