From 3eb4aab7199ae959ab140e8aa29d90ce7bf28d4e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Jan 2023 11:46:36 -0700 Subject: [PATCH] Rename to allow_rust_tests This changes skip_rust_tests to invert the sense, and renames it to allow_rust_tests. --- gdb/testsuite/gdb.rust/dwindex.exp | 2 +- gdb/testsuite/gdb.rust/expr.exp | 2 +- gdb/testsuite/gdb.rust/fnfield.exp | 2 +- gdb/testsuite/gdb.rust/generics.exp | 2 +- gdb/testsuite/gdb.rust/methods.exp | 2 +- gdb/testsuite/gdb.rust/modules.exp | 2 +- gdb/testsuite/gdb.rust/pp.exp | 2 +- gdb/testsuite/gdb.rust/rawids.exp | 2 +- gdb/testsuite/gdb.rust/rust-style.exp | 2 +- gdb/testsuite/gdb.rust/simple.exp | 2 +- gdb/testsuite/gdb.rust/traits.exp | 2 +- gdb/testsuite/gdb.rust/unicode.exp | 2 +- gdb/testsuite/gdb.rust/union.exp | 2 +- gdb/testsuite/gdb.rust/unsized.exp | 2 +- gdb/testsuite/gdb.rust/watch.exp | 2 +- gdb/testsuite/lib/gdb.exp | 10 +++++----- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index a617457571f..841db216680 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -16,7 +16,7 @@ # Test that a rustc-produced .debug_aranges can be read. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index 8fd6b23023f..4a0a48ade62 100644 --- a/gdb/testsuite/gdb.rust/expr.exp +++ b/gdb/testsuite/gdb.rust/expr.exp @@ -17,7 +17,7 @@ # Rust compiler. This serves as a smoke test. load_lib "rust-support.exp" -require !skip_rust_tests +require allow_rust_tests gdb_start diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp index 2f6ddd74828..413104cca64 100644 --- a/gdb/testsuite/gdb.rust/fnfield.exp +++ b/gdb/testsuite/gdb.rust/fnfield.exp @@ -16,7 +16,7 @@ # Test trait object printing. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index 5c0c105abe5..41112afd572 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -16,7 +16,7 @@ # Test expressions involving generics. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index dfbebd6bc38..8374ab162ec 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -16,7 +16,7 @@ # Test method calls. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 9ab758b5d30..0ad1a4a6b75 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -16,7 +16,7 @@ # Test name lookup. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp index 28ae0545c5a..553bce3c1a9 100644 --- a/gdb/testsuite/gdb.rust/pp.exp +++ b/gdb/testsuite/gdb.rust/pp.exp @@ -17,7 +17,7 @@ load_lib gdb-python.exp load_lib rust-support.exp -require !skip_rust_tests allow_python_tests +require allow_rust_tests allow_python_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp index 234b4329f91..976b723833e 100644 --- a/gdb/testsuite/gdb.rust/rawids.exp +++ b/gdb/testsuite/gdb.rust/rawids.exp @@ -16,7 +16,7 @@ # Test raw identifiers. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests set v [split [rust_compiler_version] .] if {[lindex $v 0] == 1 && [lindex $v 1] < 30} { diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp index ed76fbf9760..c942673bddb 100644 --- a/gdb/testsuite/gdb.rust/rust-style.exp +++ b/gdb/testsuite/gdb.rust/rust-style.exp @@ -16,7 +16,7 @@ # Test CLI output styling for Rust. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests save_vars { env(TERM) } { # We need an ANSI-capable terminal to get the output. diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 5925a4cd12d..25152a35cd0 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -16,7 +16,7 @@ # Test expression parsing and evaluation that requires Rust compiler. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index 63a6df451f8..9aa4cbfc75c 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -16,7 +16,7 @@ # Test trait object printing. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp index aa1ace0608a..2b4766b5553 100644 --- a/gdb/testsuite/gdb.rust/unicode.exp +++ b/gdb/testsuite/gdb.rust/unicode.exp @@ -16,7 +16,7 @@ # Test raw identifiers. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests # Non-ASCII identifiers were allowed starting in 1.53. set v [split [rust_compiler_version] .] diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp index 28b787b38da..5f128c563a3 100644 --- a/gdb/testsuite/gdb.rust/union.exp +++ b/gdb/testsuite/gdb.rust/union.exp @@ -16,7 +16,7 @@ # Test of "union" for Rust. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp index ac46b2eefac..f81be8a3078 100644 --- a/gdb/testsuite/gdb.rust/unsized.exp +++ b/gdb/testsuite/gdb.rust/unsized.exp @@ -16,7 +16,7 @@ # Test expression parsing and evaluation that requires Rust compiler. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index 2c0e57db427..83cb41cc1eb 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -16,7 +16,7 @@ # Test watch -location with Rust. load_lib rust-support.exp -require !skip_rust_tests +require allow_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b6eff66f94d..9ce7c6b3aaf 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2427,10 +2427,10 @@ proc allow_d_tests {} { return 1 } -# Return 1 to skip Rust tests, 0 to try them. -proc skip_rust_tests {} { +# Return 1 to try Rust tests, 0 to skip them. +proc allow_rust_tests {} { if { ![isnative] } { - return 1 + return 0 } # The rust compiler does not support "-m32", skip. @@ -2439,12 +2439,12 @@ proc skip_rust_tests {} { if {[board_info $board exists multilib_flags]} { foreach flag [board_info $board multilib_flags] { if { $flag == "-m32" } { - return 1 + return 0 } } } - return 0 + return 1 } # Return a 1 for configurations that support Python scripting. -- 2.30.2