Add "info connections" command, "info inferiors" connection number/string

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.multi / remove-inferiors.exp

diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index c49b31d4e991628722c1da83227a804915f559e3..54c2c000290c936c7157bc87466e7fa3f8f7c425 100644 (file)
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -1,4 +1,4 @@
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2020 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ proc switch_to_inferior { num message } {
 }
 
 proc add_inferior { expected_num message } {
-    gdb_test "add-inferior" "Added inferior ${expected_num}" "${message}"
+    gdb_test "add-inferior" "Added inferior ${expected_num}( on connection .*)?" "${message}"
 }
 
 proc test_remove_inferiors { } {
@@ -40,7 +40,7 @@ proc test_remove_inferiors { } {
 
     # Test that it is not possible to remove the current inferior.
     gdb_test "remove-inferiors 2" \
-            "warning: Can not remove current symbol inferior 2." \
+            "warning: Can not remove current inferior 2." \
             "can't remove current inferior"
 
     # Test that it is possible to remove a non-active non-current inferior.
@@ -49,11 +49,12 @@ proc test_remove_inferiors { } {
     # Load binfile and start the inferior.
     set binfile_re [string_to_regexp ${binfile}]
     gdb_test "file ${binfile}" \
-            "Reading symbols from ${binfile_re}...done." \
-            "load binary"
+       [multi_line "Reading symbols from ${binfile_re}\.\.\.(" \
+            "Expanding full symbols from ${binfile_re}\.\.\.)?" ] \
+       "load binary"
 
     if {![runto_main]} {
-       fail "Couldn't run to main."
+       fail "couldn't run to main."
        return
     }