[gdb/testsuite] Allow gdb.rust/expr.exp without rust compiler

Proc allow_rust_tests returns 0 when there's no rust compiler, but that gives
the wrong answer for gdb.rust/expr.exp, which doesn't require it.

Fix this by using can_compile rust in the test-cases that need it, and just
returning 1 in allow_rust_tests.

Tested on x86_64-linux.

diff --git a/gdb/testsuite/gdb.rust/completion.exp b/gdb/testsuite/gdb.rust/completion.exp
index 88763952dfac6b41798710d0ec4d2261889e65ee..76c45fda7ba6ade52012f776d0dd7f58d82dcd3f 100644 (file)
--- a/gdb/testsuite/gdb.rust/completion.exp
+++ b/gdb/testsuite/gdb.rust/completion.exp
@@ -18,6 +18,7 @@
 load_lib rust-support.exp
 
 require allow_rust_tests
+require {can_compile rust}
 
 standard_testfile .rs
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {

diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp
index 841db216680440c84694c80d31ba9804c3a5568b..1a82c2e92fe8d4d4ce4d88cedc8f757fc67f9f1c 100644 (file)
--- a/gdb/testsuite/gdb.rust/dwindex.exp
+++ b/gdb/testsuite/gdb.rust/dwindex.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 standard_testfile .rs
 

diff --git a/gdb/testsuite/gdb.rust/finish.exp b/gdb/testsuite/gdb.rust/finish.exp
index ab0250df277cb69cf803024d43fecab96c193895..373f8d72f5d33cdda9ebdeb4f4b6e25e4a7db185 100644 (file)
--- a/gdb/testsuite/gdb.rust/finish.exp
+++ b/gdb/testsuite/gdb.rust/finish.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 standard_testfile .rs
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {

diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp
index 5ae0c53b1eb2c5daafc06fd6c936f9f7aeb76d57..48c6179d7d65b77bc43ee7503e8f133529153c8e 100644 (file)
--- a/gdb/testsuite/gdb.rust/fnfield.exp
+++ b/gdb/testsuite/gdb.rust/fnfield.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 41112afd5721f6a2563d27f1f2c287a64b345376..7afed993a2d5e2ca330c90f315686aac4b0c1a63 100644 (file)
--- a/gdb/testsuite/gdb.rust/generics.exp
+++ b/gdb/testsuite/gdb.rust/generics.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 standard_testfile .rs
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {

diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp
index 9c513f91c1d76fb69f99ad5d632ccad4aa6fa202..caede88a1fa9140ccbbe1afcd0a63aedc882f8d7 100644 (file)
--- a/gdb/testsuite/gdb.rust/main-crash.exp
+++ b/gdb/testsuite/gdb.rust/main-crash.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 standard_testfile main.rs
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile \

diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp
index 72be6a11ab04b0ae6dc5c11c4b894d31171b19a7..dd95429de7d9b3f9466fa486a49d094697697236 100644 (file)
--- a/gdb/testsuite/gdb.rust/methods.exp
+++ b/gdb/testsuite/gdb.rust/methods.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 0ad1a4a6b75a102ceb7a747f7ce9af4b202f0a68..076ef5c2dd418b01829ebdf9dd09355965e5f9fc 100644 (file)
--- a/gdb/testsuite/gdb.rust/modules.exp
+++ b/gdb/testsuite/gdb.rust/modules.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 standard_testfile .rs
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {

diff --git a/gdb/testsuite/gdb.rust/onetwoeight.exp b/gdb/testsuite/gdb.rust/onetwoeight.exp
index 317c848a89997b6d34bcc1861751482218fda878..ef56bcafda262672db06edce70377028ea02b6ca 100644 (file)
--- a/gdb/testsuite/gdb.rust/onetwoeight.exp
+++ b/gdb/testsuite/gdb.rust/onetwoeight.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 set v [split [rust_compiler_version] .]
 if {[lindex $v 0] == 1 && [lindex $v 1] < 43} {

diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp
index 553bce3c1a91f1a7dedfaee7c751c953313cee6b..ef66717607bd500012f24db8001758f32ff74568 100644 (file)
--- a/gdb/testsuite/gdb.rust/pp.exp
+++ b/gdb/testsuite/gdb.rust/pp.exp
@@ -18,6 +18,7 @@
 load_lib gdb-python.exp
 load_lib rust-support.exp
 require allow_rust_tests allow_python_tests
+require {can_compile rust}
 
 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 976b723833e4cd892b19d1e04f1754fc32dc192d..56d1e5f64b3eeb110033001c2afbe360cc23e447 100644 (file)
--- a/gdb/testsuite/gdb.rust/rawids.exp
+++ b/gdb/testsuite/gdb.rust/rawids.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 set v [split [rust_compiler_version] .]
 if {[lindex $v 0] == 1 && [lindex $v 1] < 30} {

diff --git a/gdb/testsuite/gdb.rust/rust-start.exp b/gdb/testsuite/gdb.rust/rust-start.exp
index 96ba2ae3ac87859426cc35f1ab9f1721065b426a..ca2608465ddc2779179b0bc422bdc5d7635d41a1 100644 (file)
--- a/gdb/testsuite/gdb.rust/rust-start.exp
+++ b/gdb/testsuite/gdb.rust/rust-start.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 # This testcase verifies the behavior of the `start' command, which
 # does not work when we use the gdb stub...

diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp
index c942673bddbcebce5853decb6cbc447970ebc0d4..0555ea4b8a464c0432c6c62422e5e8a0d8691661 100644 (file)
--- a/gdb/testsuite/gdb.rust/rust-style.exp
+++ b/gdb/testsuite/gdb.rust/rust-style.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 25152a35cd0789e6e1bb57bda9128f394cf8c0cc..08ebed3f103b5712c909ef61632b9242bef2e665 100644 (file)
--- a/gdb/testsuite/gdb.rust/simple.exp
+++ b/gdb/testsuite/gdb.rust/simple.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 9aa4cbfc75c630ddc43c4510e85258cb1d8a186b..e52749733d74a81906485e41ca69d892bcab8399 100644 (file)
--- a/gdb/testsuite/gdb.rust/traits.exp
+++ b/gdb/testsuite/gdb.rust/traits.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 2b4766b5553cb936310d0daf0b09879a6a7abccc..7124934c8d5343657a07c60bc5524a267d830c9b 100644 (file)
--- a/gdb/testsuite/gdb.rust/unicode.exp
+++ b/gdb/testsuite/gdb.rust/unicode.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 # 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 5f128c563a316005fcd96383c8af66e6edb36f0b..6074717d276a819dba90da0aa3733df72725f264 100644 (file)
--- a/gdb/testsuite/gdb.rust/union.exp
+++ b/gdb/testsuite/gdb.rust/union.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 f81be8a30780902eceb5eaaef683ecba39a33844..a12d8f0bac4abacead1270bff1ae5a1eb8950a00 100644 (file)
--- a/gdb/testsuite/gdb.rust/unsized.exp
+++ b/gdb/testsuite/gdb.rust/unsized.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 43c88f8a1fc7a2ff02d7c2074eed4b9ac0dea4c9..ae359420aadfa5f3a0aa4cda9830920aec6f8267 100644 (file)
--- a/gdb/testsuite/gdb.rust/watch.exp
+++ b/gdb/testsuite/gdb.rust/watch.exp
@@ -17,6 +17,7 @@
 
 load_lib rust-support.exp
 require allow_rust_tests
+require {can_compile rust}
 
 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 769bb28c356b5c7fe017e46516bc94dd0ecee324..46aa1441d6d0c7aee29dc3738802716e3be0081a 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2503,10 +2503,6 @@ gdb_caching_proc can_compile { lang } {
 
 # Return 1 to try Rust tests, 0 to skip them.
 proc allow_rust_tests {} {
-    if { ![can_compile rust] } {
-       return 0
-    }
-
     return 1
 }