aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2008-03-23 17:29:34 +0000
committerDaniel Jacobowitz <drow@false.org>2008-03-23 17:29:34 +0000
commit12f4afab79d6b54e89df93df342e1fe6009bd2cd (patch)
tree34f688e1bb4cf80ff06a473841d94f8b1aecc083 /gdb/testsuite
parent6208b47d6c2552d1dd81d85b8b8ce350ea9fd09e (diff)
downloadgdb-12f4afab79d6b54e89df93df342e1fe6009bd2cd.zip
gdb-12f4afab79d6b54e89df93df342e1fe6009bd2cd.tar.gz
gdb-12f4afab79d6b54e89df93df342e1fe6009bd2cd.tar.bz2
Revert 2008-03-21 changes.
Diffstat (limited to 'gdb/testsuite')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.cp/annota2.exp3
-rw-r--r--gdb/testsuite/gdb.cp/annota3.exp2
3 files changed, 10 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5df1fb3..b754c23 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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>
* gdb.cp/annota2.exp, gdb.cp/annota3.exp: Remove KFAIL for
diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 2dd9f4b..4cf6b71 100644
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -205,10 +205,13 @@ 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 7b7e9f9..c2d6168 100644
--- a/gdb/testsuite/gdb.cp/annota3.exp
+++ b/gdb/testsuite/gdb.cp/annota3.exp
@@ -208,6 +208,8 @@ 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"