diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2008-10-16 16:25:37 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2008-10-16 16:25:37 +0000 |
| commit | cce893561b4f4d9571515e397bee5d4267d06a37 (patch) | |
| tree | b43ff908c02d3bac841a208f29f12010fc70037a /gdb/testsuite | |
| parent | ce78b96d4f550fd3e28d31ffa74208f609bfa344 (diff) | |
| download | gdb-cce893561b4f4d9571515e397bee5d4267d06a37.zip gdb-cce893561b4f4d9571515e397bee5d4267d06a37.tar.gz gdb-cce893561b4f4d9571515e397bee5d4267d06a37.tar.bz2 | |
* gdb.base/foll-fork.exp: Adjust the expected output to match
the new description for fork/vfork catchpoints in the "info
breakpoints" output.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/foll-fork.exp | 24 |
2 files changed, 16 insertions, 14 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 01c0fb7..9801cae 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-10-16 Joel Brobecker <brobecker@adacore.com> + + * gdb.base/foll-fork.exp: Adjust the expected output to match + the new description for fork/vfork catchpoints in the "info + breakpoints" output. + 2008-10-16 Paul Pluzhnikov <ppluzhnikov@google.com> * Makefile.in: Add gdb.python to ALL_SUBDIRS. diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index b946cb3..79a9a01 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -158,14 +158,11 @@ proc catch_fork_child_follow {} { # Verify that the catchpoint is mentioned in an "info breakpoints", # and further that the catchpoint mentions no process id. # - send_gdb "info breakpoints\n" - gdb_expect { - -re ".*catch fork.*keep y.*$gdb_prompt $"\ - {pass "info shows catchpoint without pid"} - -re ".*catch fork.*process .*$gdb_prompt $"\ - {fail "info shows catchpoint without pid"} - -re "$gdb_prompt $" {fail "info shows catchpoint without pid"} - timeout {fail "(timeout) info shows catchpoint without pid"} + set test_name "info shows catchpoint without pid" + gdb_test_multiple "info breakpoints" "$test_name" { + -re ".*catchpoint.*keep y.*fork\[\r\n\]+$gdb_prompt $" { + pass "$test_name" + } } send_gdb "continue\n" @@ -179,12 +176,11 @@ proc catch_fork_child_follow {} { # Verify that the catchpoint is mentioned in an "info breakpoints", # and further that the catchpoint managed to capture a process id. # - send_gdb "info breakpoints\n" - gdb_expect { - -re ".*catch fork .*process \[0-9\]+.*$gdb_prompt $"\ - {pass "info shows catchpoint pid"} - -re "$gdb_prompt $" {fail "info shows catchpoint pid"} - timeout {fail "(timeout) info shows catchpoint pid"} + set test_name "info shows catchpoint without pid" + gdb_test_multiple "info breakpoints" "$test_name" { + -re ".*catchpoint.*keep y.*fork, process.*$gdb_prompt $" { + pass "$test_name" + } } send_gdb "set follow child\n" |