This changes some tests to use "require skip_rust_tests".
---
gdb/testsuite/gdb.rust/dwindex.exp | 4 +---
gdb/testsuite/gdb.rust/expr.exp | 2 +-
gdb/testsuite/gdb.rust/fnfield.exp | 4 +---
gdb/testsuite/gdb.rust/generics.exp | 4 +---
gdb/testsuite/gdb.rust/methods.exp | 4 +---
gdb/testsuite/gdb.rust/modules.exp | 4 +---
gdb/testsuite/gdb.rust/pp.exp | 4 +---
gdb/testsuite/gdb.rust/rawids.exp | 4 +---
gdb/testsuite/gdb.rust/rust-style.exp | 4 +---
gdb/testsuite/gdb.rust/simple.exp | 4 +---
gdb/testsuite/gdb.rust/traits.exp | 4 +---
gdb/testsuite/gdb.rust/unicode.exp | 4 +---
gdb/testsuite/gdb.rust/union.exp | 4 +---
gdb/testsuite/gdb.rust/unsized.exp | 4 +---
gdb/testsuite/gdb.rust/watch.exp | 4 +---
15 files changed, 15 insertions(+), 43 deletions(-)
@@ -16,9 +16,7 @@
# Test that a rustc-produced .debug_aranges can be read.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
@@ -17,7 +17,7 @@
# Rust compiler. This serves as a smoke test.
load_lib "rust-support.exp"
-if {[skip_rust_tests]} { return }
+require !skip_rust_tests
gdb_start
@@ -16,9 +16,7 @@
# Test trait object printing.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test expressions involving generics.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test method calls.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test name lookup.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -17,9 +17,7 @@
load_lib gdb-python.exp
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test raw identifiers.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
set v [split [rust_compiler_version] .]
if {[lindex $v 0] == 1 && [lindex $v 1] < 30} {
@@ -16,9 +16,7 @@
# Test CLI output styling for Rust.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
save_vars { env(TERM) } {
# We need an ANSI-capable terminal to get the output.
@@ -16,9 +16,7 @@
# Test expression parsing and evaluation that requires Rust compiler.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test trait object printing.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test raw identifiers.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
# Non-ASCII identifiers were allowed starting in 1.53.
set v [split [rust_compiler_version] .]
@@ -16,9 +16,7 @@
# Test of "union" for Rust.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test expression parsing and evaluation that requires Rust compiler.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
@@ -16,9 +16,7 @@
# Test watch -location with Rust.
load_lib rust-support.exp
-if {[skip_rust_tests]} {
- return
-}
+require !skip_rust_tests
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {