summaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.multi
diff options
context:
space:
mode:
authorPedro Alves <pedro@codesourcery.com>2012-01-26 10:09:42 +0000
committerPedro Alves <pedro@codesourcery.com>2012-01-26 10:09:42 +0000
commitfacd11c8873e61e8f8834b6268b6b94608e54f44 (patch)
tree143935fcefae878e9aa729c76ccdae96537c528d /gdb/testsuite/gdb.multi
parent4ddccbc58b822b0c35f0f46891a2d276d095ec2a (diff)
downloadgdb-facd11c8873e61e8f8834b6268b6b94608e54f44.tar.gz
2012-01-26 Pedro Alves <palves@redhat.com>
Make test messages unique, and more identifiable. * gdb.multi/watchpoint-multi.exp: Change test messages.
Diffstat (limited to 'gdb/testsuite/gdb.multi')
-rw-r--r--gdb/testsuite/gdb.multi/watchpoint-multi.exp24
1 files changed, 15 insertions, 9 deletions
diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
index 3c4ad8b0898..bb5675bea42 100644
--- 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"