[src/trunk]: src/tests/fs/vfs skip tests which use features which rumpfs does...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58025d1fc9aa
branches:  trunk
changeset: 758633:58025d1fc9aa
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Nov 11 17:44:44 2010 +0000

description:
skip tests which use features which rumpfs does not support
(namely: vop_rename and a file system size limit)

diffstat:

 tests/fs/vfs/t_full.c       |   7 ++++---
 tests/fs/vfs/t_renamerace.c |   8 +++++++-
 tests/fs/vfs/t_vnops.c      |  14 +++++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diffs (99 lines):

diff -r 7b2a10597620 -r 58025d1fc9aa tests/fs/vfs/t_full.c
--- a/tests/fs/vfs/t_full.c     Thu Nov 11 17:39:29 2010 +0000
+++ b/tests/fs/vfs/t_full.c     Thu Nov 11 17:44:44 2010 +0000
@@ -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;
diff -r 7b2a10597620 -r 58025d1fc9aa tests/fs/vfs/t_renamerace.c
--- a/tests/fs/vfs/t_renamerace.c       Thu Nov 11 17:39:29 2010 +0000
+++ b/tests/fs/vfs/t_renamerace.c       Thu Nov 11 17:44:44 2010 +0000
@@ -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))
diff -r 7b2a10597620 -r 58025d1fc9aa tests/fs/vfs/t_vnops.c
--- a/tests/fs/vfs/t_vnops.c    Thu Nov 11 17:39:29 2010 +0000
+++ b/tests/fs/vfs/t_vnops.c    Thu Nov 11 17:44:44 2010 +0000
@@ -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");