From: Joel Brobecker Date: Thu, 30 Oct 2008 05:17:58 +0000 (+0000) Subject: gdb.base/foll-exec.exp: Update the expected output of a couple X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=462f405c6e81967cd75dcc6e1254a49f283ded64;p=binutils-gdb.git gdb.base/foll-exec.exp: Update the expected output of a couple of "info breakpoints" tests. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5a8336c240d..5229ff2793b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-10-30 Joel Brobecker + + gdb.base/foll-exec.exp: Update the expected output of a couple + of "info breakpoints" tests. + 2008-10-28 Tom Tromey * gdb.base/exprs.exp (test_expr): Add enum formatting tests. diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp index 861cf97d492..358c84c878e 100644 --- a/gdb/testsuite/gdb.base/foll-exec.exp +++ b/gdb/testsuite/gdb.base/foll-exec.exp @@ -217,14 +217,11 @@ proc do_exec_tests {} { # Verify that the catchpoint is mentioned in an "info breakpoints", # and further that the catchpoint mentions no program name. # - send_gdb "info breakpoints\n" - gdb_expect { - -re ".*catch exec.*keep y.*$gdb_prompt $"\ - {pass "info shows catchpoint without exec pathname"} - -re ".*catch exec.*program \"\".*$gdb_prompt $"\ - {fail "info shows catchpoint without exec pathname"} - -re "$gdb_prompt $" {fail "info shows catchpoint without exec pathname"} - timeout {fail "(timeout) info shows catchpoint without exec pathname"} + set msg "info shows catchpoint without exec pathname" + gdb_test_multiple "info breakpoints" $msg { + -re ".*catchpoint.*keep y.*exec\[\n\r\]+$gdb_prompt $" { + pass $msg + } } # DTS CLLbs16760 @@ -248,12 +245,11 @@ proc do_exec_tests {} { # and further that the catchpoint managed to capture the exec'd # program's name. # - send_gdb "info breakpoints\n" - gdb_expect { - -re ".*catch exec .*program \".*${testfile2}\".*$gdb_prompt $"\ - {pass "info shows catchpoint exec pathname"} - -re "$gdb_prompt $" {fail "info shows catchpoint exec pathname"} - timeout {fail "(timeout) info shows catchpoint exec pathname"} + set msg "info shows catchpoint exec pathname" + gdb_test_multiple "info breakpoints" $msg { + -re ".*catchpoint.*keep y.*exec, program \".*${testfile2}\".*$gdb_prompt $" { + pass $msg + } } # Verify that we can continue from the catchpoint, and land in the