[SCM] archer-jankratochvil-watchpoint3: Merge branch 'f-cleanup-fork-multifix' into archer-jankratochvil-watchpoint3

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-watchpoint3 has been updated
       via  9ffdb81bc216f908184b56c00ad44ef0246c2121 (commit)
       via  04317efd12001065c1288f495fd25e0bedc81170 (commit)
      from  f1bda6d1a418bddf2bdd569dd735bcf5ed525c32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 9ffdb81bc216f908184b56c00ad44ef0246c2121
Merge: f1bda6d 04317ef
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Jan 20 02:30:49 2012 +0100

    Merge branch 'f-cleanup-fork-multifix' into archer-jankratochvil-watchpoint3

commit 04317efd12001065c1288f495fd25e0bedc81170
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Jan 20 02:30:44 2012 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/testsuite/gdb.multi/watchpoint-multi.exp |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

First 500 lines of diff:
diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
index 93245f1..92a81f7 100644
--- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp
+++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp
@@ -69,18 +69,23 @@ gdb_breakpoint "marker_exit"
 
 gdb_test "inferior 1" "witching to inferior 1 .*"
 
-gdb_test "awatch b" "Hardware access \\(read/write\\) watchpoint \[0-9\]+: b"
+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 "inferior 2" "witching to inferior 2 .*"
+    gdb_test "inferior 2" "witching to inferior 2 .*"
 
-# 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"
+    # 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" "Breakpoint \[0-9\]+, marker_exit .*" "catch marker_exit in 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 .*"
 
-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"
+}
 
 gdb_test "continue" "Breakpoint \[0-9\]+, marker_exit .*" "catch marker_exit in inferior 1"


hooks/post-receive
--
Repository for Project Archer.