Module Name: src
Committed By: pooka
Date: Thu Nov 11 17:44:44 UTC 2010
Modified Files:
src/tests/fs/vfs: t_full.c t_renamerace.c t_vnops.c
Log Message:
skip tests which use features which rumpfs does not support
(namely: vop_rename and a file system size limit)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/vfs/t_full.c
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/vfs/t_renamerace.c
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_vnops.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_full.c
diff -u src/tests/fs/vfs/t_full.c:1.3 src/tests/fs/vfs/t_full.c:1.4
--- src/tests/fs/vfs/t_full.c:1.3 Sat Aug 28 10:56:11 2010
+++ src/tests/fs/vfs/t_full.c Thu Nov 11 17:44:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_full.c,v 1.3 2010/08/28 10:56:11 wiz Exp $ */
+/* $NetBSD: t_full.c,v 1.4 2010/11/11 17:44:44 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -56,8 +56,9 @@
size_t bonus;
int fd, i = 0;
- if (FSTYPE_PUFFS(tc)) {
- atf_tc_skip("puffs does not support explicit block allocation (GOP_ALLOC)");
+ if (FSTYPE_PUFFS(tc) || FSTYPE_RUMPFS(tc)) {
+ atf_tc_skip("fs does not support explicit block allocation "
+ "(GOP_ALLOC)");
}
bonus = 0;
Index: src/tests/fs/vfs/t_renamerace.c
diff -u src/tests/fs/vfs/t_renamerace.c:1.13 src/tests/fs/vfs/t_renamerace.c:1.14
--- src/tests/fs/vfs/t_renamerace.c:1.13 Mon Nov 1 14:04:02 2010
+++ src/tests/fs/vfs/t_renamerace.c Thu Nov 11 17:44:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_renamerace.c,v 1.13 2010/11/01 14:04:02 pooka Exp $ */
+/* $NetBSD: t_renamerace.c,v 1.14 2010/11/11 17:44:44 pooka Exp $ */
/*
* Modified for rump and atf from a program supplied
@@ -87,6 +87,9 @@
if (FSTYPE_MSDOS(tc))
atf_tc_skip("test fails in some setups, reason unknown");
+ if (FSTYPE_RUMPFS(tc))
+ atf_tc_skip("rename not supported by fs");
+
RZ(rump_pub_lwproc_newproc());
RL(wrkpid = rump_sys_getpid());
@@ -122,6 +125,9 @@
if (FSTYPE_SYSVBFS(tc))
atf_tc_skip("directories not supported");
+ if (FSTYPE_RUMPFS(tc))
+ atf_tc_skip("rename not supported by fs");
+
/* XXX: msdosfs also sometimes hangs */
if (FSTYPE_FFS(tc) || FSTYPE_EXT2FS(tc) || FSTYPE_LFS(tc) ||
FSTYPE_MSDOS(tc))
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.9 src/tests/fs/vfs/t_vnops.c:1.10
--- src/tests/fs/vfs/t_vnops.c:1.9 Thu Sep 9 11:42:52 2010
+++ src/tests/fs/vfs/t_vnops.c Thu Nov 11 17:44:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.9 2010/09/09 11:42:52 njoly Exp $ */
+/* $NetBSD: t_vnops.c,v 1.10 2010/11/11 17:44:44 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -171,6 +171,9 @@
if (FSTYPE_MSDOS(tc))
atf_tc_skip("test fails in some setups, reason unknown");
+ if (FSTYPE_RUMPFS(tc))
+ atf_tc_skip("rename not supported by fs");
+
USES_DIRS;
md(pb1, mp, "dir1");
@@ -251,6 +254,9 @@
rename_dotdot(const atf_tc_t *tc, const char *mp)
{
+ if (FSTYPE_RUMPFS(tc))
+ atf_tc_skip("rename not supported by fs");
+
USES_DIRS;
if (rump_sys_chdir(mp) == -1)
@@ -284,6 +290,9 @@
struct stat sb;
ino_t f1ino, f2ino;
+ if (FSTYPE_RUMPFS(tc))
+ atf_tc_skip("rename not supported by fs");
+
if (FSTYPE_MSDOS(tc))
atf_tc_skip("test fails in some setups, reason unknown");
@@ -403,6 +412,9 @@
long val;
size_t len;
+ if (FSTYPE_RUMPFS(tc))
+ atf_tc_skip("rename not supported by fs");
+
if (rump_sys_chdir(mp) == -1)
atf_tc_fail_errno("chdir mountpoint");
