Module Name: src
Committed By: riastradh
Date: Wed May 9 00:22:26 UTC 2012
Modified Files:
src/tests/fs/vfs: t_renamerace.c
Log Message:
Adjust t_renamerace now that ext2fs and ffs have good rename.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tests/fs/vfs/t_renamerace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/vfs/t_renamerace.c
diff -u src/tests/fs/vfs/t_renamerace.c:1.25 src/tests/fs/vfs/t_renamerace.c:1.26
--- src/tests/fs/vfs/t_renamerace.c:1.25 Thu Feb 16 02:47:56 2012
+++ src/tests/fs/vfs/t_renamerace.c Wed May 9 00:22:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_renamerace.c,v 1.25 2012/02/16 02:47:56 perseant Exp $ */
+/* $NetBSD: t_renamerace.c,v 1.26 2012/05/09 00:22:26 riastradh Exp $ */
/*
* Modified for rump and atf from a program supplied
@@ -129,13 +129,9 @@ renamerace_dirs(const atf_tc_t *tc, cons
atf_tc_skip("rename not supported by file system");
/* XXX: msdosfs also sometimes hangs */
- if (FSTYPE_EXT2FS(tc) || FSTYPE_MSDOS(tc))
+ if (FSTYPE_MSDOS(tc))
atf_tc_expect_signal(-1, "PR kern/43626");
- /* XXX: unracy execution not caught */
- if (FSTYPE_P2K_FFS(tc))
- atf_tc_expect_fail("PR kern/44336"); /* child dies */
-
RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
RL(wrkpid = rump_sys_getpid());
@@ -154,14 +150,8 @@ renamerace_dirs(const atf_tc_t *tc, cons
* Doesn't always trigger when run on a slow backend
* (i.e. not on tmpfs/mfs). So do the usual kludge.
*/
- if (FSTYPE_EXT2FS(tc) || FSTYPE_MSDOS(tc))
+ if (FSTYPE_MSDOS(tc))
abort();
-
- if (FSTYPE_P2K_FFS(tc)) {
- /* XXX: some races may hang test run if we don't unmount */
- puffs_fstest_unmount(tc, mp, MNT_FORCE);
- atf_tc_fail("problem did not trigger");
- }
}
ATF_TC_FSAPPLY(renamerace, "rename(2) race with file unlinked mid-operation");
