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

diff --git a/gdb/tclint.toml b/gdb/tclint.toml
index 1700b94b4061d9230469ba477bff035cbd7cdef7..4853968dfb70d5c3dafb2db72600022da0b42ce6 100644 (file)
--- a/gdb/tclint.toml
+++ b/gdb/tclint.toml
@@ -37,7 +37,6 @@ exclude = [
 "gdb/testsuite/lib/aarch64-scalable.exp",
 "gdb/testsuite/lib/check-test-names.exp",
 "gdb/testsuite/lib/cp-support.exp",
-"gdb/testsuite/lib/d-support.exp",
 "gdb/testsuite/lib/dwarf.exp",
 "gdb/testsuite/lib/fortran.exp",
 "gdb/testsuite/lib/future.exp",

diff --git a/gdb/testsuite/lib/d-support.exp b/gdb/testsuite/lib/d-support.exp
index 717d88bf078e80b55cbaebe3eaf88447424be156..0714b40d35c6d018448314b4f428bfe7be5dd46f 100644 (file)
--- a/gdb/testsuite/lib/d-support.exp
+++ b/gdb/testsuite/lib/d-support.exp
@@ -17,11 +17,12 @@
 # The result is 1 (true) for success, 0 (false) for failure.
 
 proc set_lang_d {} {
-    if [gdb_test_no_output "set language d"] {
+    if {[gdb_test_no_output "set language d"]} {
        return 0
     }
-    if [gdb_test "show language" ".* source language is \"d\"." \
-          "set language to \"d\""] {
+    if {[gdb_test "show language" \
+            [string_to_regexp {The current source language is "d".}] \
+            {set language to "d"}]} {
        return 0
     }
     return 1