2012-01-26 Pedro Alves <palves@redhat.com>

	Make test messages unique, and more identifiable.
	* gdb.multi/watchpoint-multi.exp: Change test messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9e4d06f40d099c0009ae0fdc58e76c4dcc2d71c8..fc565fdd7a8799cb94e3d8d354f6d3ae000f3351 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-26  Pedro Alves  <palves@redhat.com>
+
+       Make test messages unique, and more identifiable.
+       * gdb.multi/watchpoint-multi.exp: Change test messages.
+
 2012-01-25  Tom Tromey  <tromey@redhat.com>
 
        * gdb.base/solib-disc.exp: Fix regexps.

diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
index 3c4ad8b0898d5f193a7134f24d3592ae520cf33b..bb5675bea42ec0a9e6d4f6f512d3e1fb6d194248 100644 (file)
--- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
@@ -56,36 +56,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" "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"