[gdb/testsuite, tclint] Fix lib/rust-support.exp

diff --git a/gdb/tclint.toml b/gdb/tclint.toml
index 565dbaae701bf719146ac1e34e535b40df4caed5..128951283e7ae47c7a7ec040fe59009703b58270 100644 (file)
--- a/gdb/tclint.toml
+++ b/gdb/tclint.toml
@@ -47,7 +47,6 @@ exclude = [
 "gdb/testsuite/lib/pascal.exp",
 "gdb/testsuite/lib/perftest.exp",
 "gdb/testsuite/lib/prelink-support.exp",
-"gdb/testsuite/lib/rust-support.exp",
 "gdb/testsuite/lib/selftest-support.exp",
 "gdb/testsuite/lib/trace-support.exp",
 # IGNORE (document reason in trailing comment):

diff --git a/gdb/testsuite/lib/rust-support.exp b/gdb/testsuite/lib/rust-support.exp
index 94888e93adb04854ecb26bca43648be7584a80f8..7087e8288b5295e2fb2ed4df0783141e5085381c 100644 (file)
--- a/gdb/testsuite/lib/rust-support.exp
+++ b/gdb/testsuite/lib/rust-support.exp
@@ -16,11 +16,12 @@
 # Auxiliary function to set the language to Rust.
 # The result is 1 (true) for success, 0 (false) for failure.
 proc set_lang_rust {} {
-    if [gdb_test_no_output "set language rust"] {
+    if {[gdb_test_no_output "set language rust"]} {
        return 0
     }
-    if [gdb_test "show language" ".* source language is \"rust\"." \
-          "set language to \"rust\""] {
+    if {[gdb_test "show language" \
+            [string_to_regexp {The current source language is "rust".}] \
+            {set language to "rust"}]} {
        return 0
     }
     return 1