diff options
| author | Paul N. Hilfinger <hilfinger@adacore.com> | 2012-01-11 10:36:18 +0000 |
|---|---|---|
| committer | Paul N. Hilfinger <hilfinger@adacore.com> | 2012-01-11 10:36:18 +0000 |
| commit | 97ddaa9bd5f8f4d51d6dac55831d2494a0ea2bdd (patch) | |
| tree | 9e3ee3ae9c11133ebc873841dacfd0417738e297 /gdb/testsuite/gdb.base/watchpoint.exp | |
| parent | ea7335759531113c855fab30d191462b44a08dd8 (diff) | |
| download | gdb-97ddaa9bd5f8f4d51d6dac55831d2494a0ea2bdd.zip gdb-97ddaa9bd5f8f4d51d6dac55831d2494a0ea2bdd.tar.gz gdb-97ddaa9bd5f8f4d51d6dac55831d2494a0ea2bdd.tar.bz2 | |
Add test for use of "<block>::<variable>" syntax for locals in watch.
First, fix a technical problem with the function recurser. The test sets a
watch on local_x at a point where its value is technically undefined. The
test is written assuming that the value is not initially 2, but nothing in the
C standard guarantees that.
Second, augment the existing test for variables in recursive calls to check an
equivalent expression that explicitly sets the scope of the local variable
being tracked.
2012-01-11 Paul Hilfinger <hilfingr@adacore.com>
* gdb.base/watchpoint.c (recurser): Initialize local_x.
(main): Repeat recurser call.
* gdb.base/watchpoint.exp: Check that 'watch recurser::local_x' is
equivalent to 'local_x'.
Diffstat (limited to 'gdb/testsuite/gdb.base/watchpoint.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint.exp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index f321de5..1860368 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -580,6 +580,7 @@ proc test_complex_watchpoint {} { # gdb_test "tbreak recurser" ".*breakpoint.*" gdb_test "cont" "Continuing.*recurser.*" + gdb_test "next" "if \\(x > 0.*" "next past local_x initialization" gdb_test "watch local_x" ".*\[Ww\]atchpoint \[0-9\]*: local_x" \ "set local watch in recursive call" gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_x.*New value = 2.*" \ @@ -587,6 +588,19 @@ proc test_complex_watchpoint {} { gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" \ "self-delete local watch in recursive call" + # Repeat the preceding test, but this time use "recurser::local_x" as + # the variable to track. + gdb_test "cont" "Continuing.*marker6.*" + gdb_test "tbreak recurser" ".*breakpoint.*" + gdb_test "cont" "Continuing.*recurser.*" + gdb_test "next" "if \\(x > 0.*" "next past local_x initialization" + gdb_test "watch recurser::local_x" ".*\[Ww\]atchpoint \[0-9\]*: recurser::local_x" \ + "set local watch in recursive call with explicit scope" + gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: recurser::local_x.*New value = 2.*" \ + "trigger local watch with explicit scope in recursive call" + gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" \ + "self-delete local watch with explicit scope in recursive call (2)" + # Disable everything so we can finish the program at full speed gdb_test_no_output "disable" "disable in test_complex_watchpoint" |