diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/fileio.exp | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4c0d6d0..9be303e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-01-12 Andrew Cagney <cagney@redhat.com> + + * gdb.base/fileio.exp: Update copyright year. On GNU/Linux, for + "Renaming a directory to a non-empty directory returns ENOTEMPTY + or EEXIST", treat EBUSY as an XFAIL. + 2004-01-11 Michael Chastain <mec.gnu@mindspring.com> * gdb.base/scope.exp: Remove obsolete setup_xfail for diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp index 128cbb6..80dc618 100644 --- a/gdb/testsuite/gdb.base/fileio.exp +++ b/gdb/testsuite/gdb.base/fileio.exp @@ -1,4 +1,4 @@ -# Copyright 2002, 2003 +# Copyright 2002, 2003, 2004 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -216,9 +216,19 @@ gdb_test continue \ "Renaming a file to existing directory returns EISDIR" send_gdb "tbreak 388\n" ; gdb_expect -re "$gdb_prompt $" -gdb_test continue \ - "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST).*test_rename \\(\\) at.*$srcfile:388.*" \ -"Renaming a directory to a non-empty directory returns ENOTEMPTY or EEXIST" +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.*" { + pass "${test}" + } + -re "Continuing\\..*rename 3:.*EBUSY.*test_rename \\(\\) at.*$srcfile:388.*" { + # At least version <= 2.6/2004-01-08 of the Linux Kernel gets + # this wrong (reporting EBUSY) when the file system is NFS + # mounted. + setup_xfail *-*-*linux* gdb/1502 + fail "${test}" + } +} send_gdb "tbreak 393\n" ; gdb_expect -re "$gdb_prompt $" gdb_test continue \ |