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

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

diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
index 3c4ad8b0898d5f193a7134f24d3592ae520cf33b..2d48b70f95e47a40e0c22e4e91c953cfcd4874d1 100644 (file)
--- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
@@ -1,4 +1,4 @@
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2012-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
@@ -13,12 +13,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "watchpoint-multi"
+standard_testfile
+set executable ${testfile}
 
 # Multiple inferiors are needed, therefore both native and extended gdbserver
 # modes are supported.  Only non-extended gdbserver is not supported.
-if [target_info exists use_gdb_stub] {
-    untested ${testfile}.exp
+if [use_gdb_stub] {
+    untested "using gdb stub"
     return
 }
 
@@ -29,18 +30,14 @@ if [skip_hw_watchpoint_access_tests] {
     return
 }
 
-set executable ${testfile}
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${executable}
-
 if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested ${testfile}.exp
+    untested "failed to compile"
     return -1
 }
 
 clean_restart $executable
 
-# Simulate non-stop+target-async which also uses breakpoint always-inserted.
+# Simulate non-stop which also uses breakpoint always-inserted.
 gdb_test_no_output "set breakpoint always-inserted on"
 # displaced-stepping is also needed as other GDB sometimes still removes the
 # breakpoints, even with always-inserted on.
@@ -56,36 +53,42 @@ if [support_displaced_stepping] {
 gdb_breakpoint main {temporary}
 gdb_test "run" "Temporary breakpoint.* main .*" "start to main inferior 1"
 
-gdb_test "add-inferior" "Added inferior 2"
-gdb_test "inferior 2" "witching to inferior 2 .*"
+gdb_test "add-inferior" "Added inferior 2 on connection .*" "add inferior 2"
+gdb_test "inferior 2" "witching to inferior 2 .*" "switch to inferior 2, first time"
 gdb_load $binfile
 
 gdb_breakpoint main {temporary}
 gdb_test "run" "Temporary breakpoint.* main .*" "start to main inferior 2"
 
-gdb_test "awatch c" "Hardware access \\(read/write\\) watchpoint \[0-9\]+: c"
+gdb_test "awatch c" \
+    "Hardware access \\(read/write\\) watchpoint \[0-9\]+: c" \
+    "awatch c on inferior 2"
 
 gdb_breakpoint "marker_exit"
 
-gdb_test "inferior 1" "witching to inferior 1 .*"
+gdb_test "inferior 1" "witching to inferior 1 .*" "switch back to inferior 1"
 
 if [skip_hw_watchpoint_multi_tests] {
     # On single hardware watchpoint at least test the watchpoint in inferior
     # 2 is not hit.
 } else {
-    gdb_test "awatch b" "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b"
+    gdb_test "awatch b" \
+       "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b" \
+       "awatch b on inferior 1"
 
-    gdb_test "inferior 2" "witching to inferior 2 .*"
+    gdb_test "inferior 2" "witching to inferior 2 .*" "switch to inferior 2 again"
 
     # FAIL would be a hit on watchpoint for `b' - that one is for the other
     # inferior.
-    gdb_test "continue" "Hardware access \\(read/write\\) watchpoint \[0-9\]+: c\r\n\r\nOld value = 0\r\nNew value = 3\r\n.*" "catch c"
+    gdb_test "continue" \
+       "Hardware access \\(read/write\\) watchpoint \[0-9\]+: c\r\n\r\nOld value = 0\r\nNew value = 3\r\n.*" \
+       "catch c on inferior 2"
 
     gdb_test "continue" "Breakpoint \[0-9\]+, marker_exit .*" "catch marker_exit in inferior 2"
 
-    gdb_test "inferior 1" "witching to inferior 1 .*"
+    gdb_test "inferior 1" "witching to inferior 1 .*" "switch back to inferior 1 again"
 
-    gdb_test "continue" "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b\r\n\r\nOld value = 0\r\nNew value = 2\r\n.*" "catch b"
+    gdb_test "continue" "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b\r\n\r\nOld value = 0\r\nNew value = 2\r\n.*" "catch b on inferior 1"
 }
 
 gdb_test "continue" "Breakpoint \[0-9\]+, marker_exit .*" "catch marker_exit in inferior 1"