From 31e5d73a4476c9c949241f682be8fe05c6315654 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 24 Mar 2008 13:27:07 +0000 Subject: [PATCH] PR gdb/544 * gdb.cp/annota2.exp, gdb.cp/annota3.exp: Reapply 2008-03-21 changes. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.cp/annota2.exp | 3 --- 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 b754c235fa7..669384e98c3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-03-23 Daniel Jacobowitz + + PR gdb/544 + * gdb.cp/annota2.exp, gdb.cp/annota3.exp: Reapply 2008-03-21 changes. + 2008-03-23 Daniel Jacobowitz PR gdb/544 diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index 4cf6b711c13..2dd9f4bfaef 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 c2d61682a0e..7b7e9f9acf5 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" -- 2.30.2