From 7049b4b8ac9039dc4f09e312e68fedc8227caac8 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 18 Jan 2004 21:17:57 +0000 Subject: [PATCH] * gdb.base/fileio.exp: Add "$gdb_prompt $" anchors to patterns used with gdb_test_multiple. --- gdb/testsuite/ChangeLog | 3 +++ gdb/testsuite/gdb.base/fileio.exp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d5fb5af145..96e1f98d7e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2004-01-18 Mark Kettenis + * gdb.base/fileio.exp: Add "$gdb_prompt $" anchors to patterns + used with gdb_test_multiple. + * gdb.base/gdb1476.exp: Accept alternat pattern for failed memory read at address 0. This fixes PR testsuite/1504. diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp index 80dc618695..2a717bff18 100644 --- a/gdb/testsuite/gdb.base/fileio.exp +++ b/gdb/testsuite/gdb.base/fileio.exp @@ -218,10 +218,10 @@ gdb_test continue \ send_gdb "tbreak 388\n" ; gdb_expect -re "$gdb_prompt $" set test "Renaming a directory to a non-empty directory returns ENOTEMPTY or EEXIST" gdb_test_multiple continue "${test}" { - -re "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST).*test_rename \\(\\) at.*$srcfile:388.*" { + -re "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST).*test_rename \\(\\) at.*$srcfile:388.*$gdb_prompt $" { pass "${test}" } - -re "Continuing\\..*rename 3:.*EBUSY.*test_rename \\(\\) at.*$srcfile:388.*" { + -re "Continuing\\..*rename 3:.*EBUSY.*test_rename \\(\\) at.*$srcfile:388.*$gdb_prompt $" { # At least version <= 2.6/2004-01-08 of the Linux Kernel gets # this wrong (reporting EBUSY) when the file system is NFS # mounted.