diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/annota2.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/annota3.exp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b754c23..669384e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2008-03-23 Daniel Jacobowitz <dan@codesourcery.com> PR gdb/544 + * gdb.cp/annota2.exp, gdb.cp/annota3.exp: Reapply 2008-03-21 changes. + +2008-03-23 Daniel Jacobowitz <dan@codesourcery.com> + + PR gdb/544 * gdb.cp/annota2.exp, gdb.cp/annota3.exp: Revert 2008-03-21 changes. 2008-03-21 Daniel Jacobowitz <dan@codesourcery.com> diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index 4cf6b71..2dd9f4b 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -205,13 +205,10 @@ gdb_expect { # test: # annotate-quit # -# This test sometimes fails, but not reproducibly. See gdb/544. -# send_gdb "\003" gdb_expect { -re "\r\n\032\032error-begin\r\nQuit\r\n\r\n\032\032quit\r\n$gdb_prompt$" \ { pass "annotate-quit" } - -re "$gdb_prompt$" { kfail "gdb/544" "annotate-quit" } -re ".*$gdb_prompt$" { fail "annotate-quit" } timeout { fail "annotate-quit (timeout)" } } diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp index c2d6168..7b7e9f9 100644 --- a/gdb/testsuite/gdb.cp/annota3.exp +++ b/gdb/testsuite/gdb.cp/annota3.exp @@ -208,8 +208,6 @@ gdb_expect { # test: # annotate-quit # -# This test sometimes fails, but not reproducibly. See gdb/544. -# send_gdb "\003" gdb_expect_list "annotate-quit" "$gdb_prompt$" { "\r\n\032\032error-begin\r\n" |