diff options
author | Tom Tromey <tom@tromey.com> | 2022-12-13 16:08:13 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2023-01-13 13:18:55 -0700 |
commit | a9145b105e28caeded3ea8135e35e5984fa10f37 (patch) | |
tree | 1e4484a91faf0e25386d10a55a3a07c8c821421e | |
parent | c89196229b8aa7966b148b7719f795b9b2db8b02 (diff) | |
download | binutils-a9145b105e28caeded3ea8135e35e5984fa10f37.zip binutils-a9145b105e28caeded3ea8135e35e5984fa10f37.tar.gz binutils-a9145b105e28caeded3ea8135e35e5984fa10f37.tar.bz2 |
Use require !skip_rust_tests
This changes some tests to use "require !skip_rust_tests".
-rw-r--r-- | gdb/testsuite/gdb.rust/dwindex.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/expr.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/fnfield.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/generics.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/methods.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/modules.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/pp.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/rawids.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/rust-style.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/simple.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/traits.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/unicode.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/union.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/unsized.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.rust/watch.exp | 4 |
15 files changed, 15 insertions, 43 deletions
diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 4f05cb9..a617457 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -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 diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index d67199e..8fd6b23 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" -if {[skip_rust_tests]} { return } +require !skip_rust_tests gdb_start diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp index 21f0fac..2f6ddd7 100644 --- a/gdb/testsuite/gdb.rust/fnfield.exp +++ b/gdb/testsuite/gdb.rust/fnfield.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index fa0f7b9..5c0c105 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index e57ef2f..dfbebd6 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 983fbd1..9ab758b 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp index b077c76..a456afc 100644 --- a/gdb/testsuite/gdb.rust/pp.exp +++ b/gdb/testsuite/gdb.rust/pp.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp index 0570697..234b432 100644 --- a/gdb/testsuite/gdb.rust/rawids.exp +++ b/gdb/testsuite/gdb.rust/rawids.exp @@ -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} { diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp index 0a5ff5e..ed76fbf 100644 --- a/gdb/testsuite/gdb.rust/rust-style.exp +++ b/gdb/testsuite/gdb.rust/rust-style.exp @@ -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. diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 3f698f1..7314aab 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index c3d1b52..63a6df4 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp index 63ed8d1..aa1ace0 100644 --- a/gdb/testsuite/gdb.rust/unicode.exp +++ b/gdb/testsuite/gdb.rust/unicode.exp @@ -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] .] diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp index baf47d2..28b787b 100644 --- a/gdb/testsuite/gdb.rust/union.exp +++ b/gdb/testsuite/gdb.rust/union.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp index ca45914..ac46b2e 100644 --- a/gdb/testsuite/gdb.rust/unsized.exp +++ b/gdb/testsuite/gdb.rust/unsized.exp @@ -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}]} { diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index b709c00..2c0e57d 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -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}]} { |