[SCM] archer-jankratochvil-watchpoint: Merge branch '3hwbp' into 4fork

[jkratoch at sourceware dot org]

The branch, archer-jankratochvil-watchpoint has been updated
       via  9d51a4b9058205accdcd9da3e94d0b8c59a2bda5 (commit)
       via  e0ed3b3704af905c601e575883d7a82cb00102cd (commit)
       via  92d0404084fd6a3aaee4b65d1cd137901aecfd11 (commit)
       via  e8679d69b07b2bbc3bb4d9065384e6bfd4304fdd (commit)
       via  718cc904526466a5695458896cdd8b4929ceeaee (commit)
       via  e1804d84742556f10db3476ba647e2f4c5ee6060 (commit)
       via  2b42a655cdaa107ef934ac5927ceee8c0735b366 (commit)
       via  bd7097ac20cbc3b1912c866c6eaa7b819ecf70f9 (commit)
       via  b5f18b8f708d595c668d2b3ee4a2d3e190b2aabc (commit)
      from  8dd523e9f9cf3083f744a887053361037a7169ee (commit)

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

- Log -----------------------------------------------------------------
commit 9d51a4b9058205accdcd9da3e94d0b8c59a2bda5
Merge: 8dd523e9f9cf3083f744a887053361037a7169ee e0ed3b3704af905c601e575883d7a82cb00102cd
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:40:27 2009 +0200

    Merge branch '3hwbp' into 4fork

commit e0ed3b3704af905c601e575883d7a82cb00102cd
Merge: 718cc904526466a5695458896cdd8b4929ceeaee 92d0404084fd6a3aaee4b65d1cd137901aecfd11
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:39:49 2009 +0200

    Merge branch '2reorder' into 3hwbp

commit 92d0404084fd6a3aaee4b65d1cd137901aecfd11
Merge: e1804d84742556f10db3476ba647e2f4c5ee6060 e8679d69b07b2bbc3bb4d9065384e6bfd4304fdd
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:39:36 2009 +0200

    Merge branch '1reset' into 2reorder

commit e8679d69b07b2bbc3bb4d9065384e6bfd4304fdd
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:39:05 2009 +0200

    gdb/testsuite/
    	* gdb.base/watchpoint-hw.exp: Replace `start' by ${test}.exp.

commit 718cc904526466a5695458896cdd8b4929ceeaee
Merge: f13f23489acac09490bda4a5010115d2bb66058b e1804d84742556f10db3476ba647e2f4c5ee6060
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:37:31 2009 +0200

    Merge branch '2reorder' into 3hwbp

commit e1804d84742556f10db3476ba647e2f4c5ee6060
Merge: bd7097ac20cbc3b1912c866c6eaa7b819ecf70f9 2b42a655cdaa107ef934ac5927ceee8c0735b366
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:36:59 2009 +0200

    Merge branch '1reset' into 2reorder

commit 2b42a655cdaa107ef934ac5927ceee8c0735b366
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:36:22 2009 +0200

    gdb/testsuite/
    	* gdb.base/watchpoint-hw.exp: Replace $testfile by $test.

commit bd7097ac20cbc3b1912c866c6eaa7b819ecf70f9
Merge: e4cc3444616af0a199556a6d2582998cefcec198 b5f18b8f708d595c668d2b3ee4a2d3e190b2aabc
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:33:36 2009 +0200

    Merge branch '1reset' into 2reorder

commit b5f18b8f708d595c668d2b3ee4a2d3e190b2aabc
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Sat Oct 3 16:31:16 2009 +0200

    Make the testcase more clear.
    
    gdb/testsuite/
    	* gdb.base/watchpoint-hw.c: New stub line, new comments.
    	* gdb.base/watchpoint-hw.exp: Replace gdb_compile by
    	prepare_for_testing.  Remove variable `binfile'.  Use clean_restart and
    	runto_main for the new testcase part.

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

Summary of changes:
 gdb/testsuite/gdb.base/watchpoint-hw.c   |    6 +++++-
 gdb/testsuite/gdb.base/watchpoint-hw.exp |   12 ++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.c b/gdb/testsuite/gdb.base/watchpoint-hw.c
index e2de53a..605304b 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw.c
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.c
@@ -22,8 +22,12 @@ main (void)
 {
   volatile int dummy;
 
+  /* Stub lines are present as no breakpoints/watchpoint gets hit if current PC
+     already stays on the line PC while entering "step"/"continue".  */
+
+  dummy = 0;	/* Stub to catch WATCHEE access after runto_main.  */
   dummy = watchee;
-  dummy = 1;
+  dummy = 1;	/* Stub to catch break-at-exit after WATCHEE has been hit.  */
   dummy = 2;	/* break-at-exit */
 
   return 0;
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp
index d74d6c7..0ce8524 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp
@@ -44,15 +44,19 @@ gdb_test "" "main .* at .*" "start"
 # Check it is really a `hw'-watchpoint.
 gdb_test "info watchpoints" "1 *hw watchpoint .* watchee"
 
-# Before the inferior gets started we would get:
-# 	Target does not support this type of hardware watchpoint.
-gdb_test "delete 1"
+
+clean_restart $test
+
+if ![runto_main] {
+    return -1
+}
+
 gdb_test "rwatch watchee"
 
 set breakline [gdb_get_line_number "break-at-exit"]
 gdb_breakpoint $breakline
 
-gdb_test "continue" "Continuing.\r\nHardware read watchpoint 3: watchee\r\n\r\nValue = 0\r\n.*"
+gdb_test "continue" "Continuing.\r\nHardware read watchpoint \[0-9\]+: watchee\r\n\r\nValue = 0\r\n.*"
 
 # Here should be no repeated notification of the read watchpoint.
 gdb_test "continue" \


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