[gdb/testsuite, tclint] Fix lib/objc.exp

diff --git a/gdb/tclint.toml b/gdb/tclint.toml
index fb3d9cf9d62ec80fe6081d341a55c99331ecb399..1edad001ba60544203bb3fb38db6815beb47f59f 100644 (file)
--- a/gdb/tclint.toml
+++ b/gdb/tclint.toml
@@ -44,7 +44,6 @@ exclude = [
 "gdb/testsuite/lib/gdb-utils.exp",
 "gdb/testsuite/lib/gen-perf-test.exp",
 "gdb/testsuite/lib/mi-support.exp",
-"gdb/testsuite/lib/objc.exp",
 "gdb/testsuite/lib/pascal.exp",
 "gdb/testsuite/lib/perftest.exp",
 "gdb/testsuite/lib/prelink-support.exp",

diff --git a/gdb/testsuite/lib/objc.exp b/gdb/testsuite/lib/objc.exp
index cf1fed92b5890f2e4c7c6cbd569e191167e132e3..cb59ca1e32b2a264bfd9fade82cf818f5c22939a 100644 (file)
--- a/gdb/testsuite/lib/objc.exp
+++ b/gdb/testsuite/lib/objc.exp
@@ -19,11 +19,12 @@
 # The result is 1 (true) for success, 0 (false) for failure.
 
 proc set_lang_objc {} {
-    if [gdb_test_no_output "set language objective-c"] {
+    if {[gdb_test_no_output "set language objective-c"]} {
        return 0
     }
-    if [gdb_test "show language" ".* source language is \"objective-c\"." \
-          "set language to \"objective-c\""] {
+    if {[gdb_test "show language" \
+            [string_to_regexp {The current source language is "objective-c".}] \
+            {set language to "objective-c"}]} {
        return 0
     }
     return 1