2004-01-08  Andrew Cagney  <cagney@redhat.com>

	* gdb.base/fileio.exp: For "Renaming a directory to a non-empty
	directory returns ENOTEMPTY or EEXIST", treat EBUSY as a KFAIL.

Index: gdb.base/fileio.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/fileio.exp,v
retrieving revision 1.5
diff -u -r1.5 fileio.exp
--- gdb.base/fileio.exp	10 Nov 2003 09:12:20 -0000	1.5
+++ gdb.base/fileio.exp	8 Jan 2004 20:09:20 -0000
@@ -216,9 +216,16 @@
 "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.*" {
+	# On NFS, GNU/Linux <= 2.6/2004-01-08 at least, gets this wrong
+	kfail gdb/1502 "${test}"
+    }
+}
 
 send_gdb "tbreak 393\n" ; gdb_expect -re "$gdb_prompt $"
 gdb_test continue \