[src/trunk]: src/tests/fs/vfs Slightly adjust skipped messages, makes output ...

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

details:   https://anonhg.NetBSD.org/src/rev/52eb55b17638
branches:  trunk
changeset: 770220:52eb55b17638
user:      njoly <njoly%NetBSD.org@localhost>
date:      Sat Oct 08 13:08:54 2011 +0000

description:
Slightly adjust skipped messages, makes output more consistent.

diffstat:

 tests/fs/vfs/t_renamerace.c |   8 ++++----
 tests/fs/vfs/t_rmdirrace.c  |   4 ++--
 tests/fs/vfs/t_vnops.c      |  15 ++++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diffs (106 lines):

diff -r 44edca1a2dce -r 52eb55b17638 tests/fs/vfs/t_renamerace.c
--- a/tests/fs/vfs/t_renamerace.c       Sat Oct 08 13:00:55 2011 +0000
+++ b/tests/fs/vfs/t_renamerace.c       Sat Oct 08 13:08:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_renamerace.c,v 1.23 2011/07/18 06:47:08 dholland Exp $       */
+/*     $NetBSD: t_renamerace.c,v 1.24 2011/10/08 13:08:54 njoly Exp $  */
 
 /*
  * Modified for rump and atf from a program supplied
@@ -85,7 +85,7 @@
                atf_tc_expect_signal(-1, "PR kern/43582");
 
        if (FSTYPE_RUMPFS(tc))
-               atf_tc_skip("rename not supported by fs");
+               atf_tc_skip("rename not supported by file system");
 
        RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG));
        RL(wrkpid = rump_sys_getpid());
@@ -133,10 +133,10 @@
        pthread_t pt1, pt2;
 
        if (FSTYPE_SYSVBFS(tc))
-               atf_tc_skip("directories not supported");
+               atf_tc_skip("directories not supported by file system");
 
        if (FSTYPE_RUMPFS(tc))
-               atf_tc_skip("rename not supported by fs");
+               atf_tc_skip("rename not supported by file system");
 
        /* XXX: msdosfs also sometimes hangs */
        if (FSTYPE_EXT2FS(tc) || FSTYPE_LFS(tc) || FSTYPE_MSDOS(tc))
diff -r 44edca1a2dce -r 52eb55b17638 tests/fs/vfs/t_rmdirrace.c
--- a/tests/fs/vfs/t_rmdirrace.c        Sat Oct 08 13:00:55 2011 +0000
+++ b/tests/fs/vfs/t_rmdirrace.c        Sat Oct 08 13:08:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_rmdirrace.c,v 1.7 2010/07/19 16:00:45 pooka Exp $    */
+/*     $NetBSD: t_rmdirrace.c,v 1.8 2011/10/08 13:08:54 njoly Exp $    */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
        if (FSTYPE_LFS(tc))
                atf_tc_expect_signal(-1, "PR kern/43582");
        if (FSTYPE_SYSVBFS(tc))
-               atf_tc_skip("rmdir(2) not supported by file system");
+               atf_tc_skip("directories not supported by file system");
 
        fd = rump_sys_open(".", O_RDONLY, 0666);
        if (fd == -1)
diff -r 44edca1a2dce -r 52eb55b17638 tests/fs/vfs/t_vnops.c
--- a/tests/fs/vfs/t_vnops.c    Sat Oct 08 13:00:55 2011 +0000
+++ b/tests/fs/vfs/t_vnops.c    Sat Oct 08 13:08:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_vnops.c,v 1.28 2011/08/19 01:25:27 riastradh Exp $   */
+/*     $NetBSD: t_vnops.c,v 1.29 2011/10/08 13:08:54 njoly Exp $       */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -45,8 +45,9 @@
 
 #define TESTFILE "afile"
 
-#define USES_DIRS \
-    if (FSTYPE_SYSVBFS(tc)) atf_tc_skip("dirs not supported by file system")
+#define USES_DIRS                                      \
+    if (FSTYPE_SYSVBFS(tc))                            \
+       atf_tc_skip("directories not supported by file system")
 
 #define USES_SYMLINKS                                  \
     if (FSTYPE_SYSVBFS(tc) || FSTYPE_MSDOS(tc))                \
@@ -205,7 +206,7 @@
        struct stat ref, sb;
 
        if (FSTYPE_RUMPFS(tc))
-               atf_tc_skip("rename not supported by fs");
+               atf_tc_skip("rename not supported by file system");
 
        USES_DIRS;
 
@@ -307,7 +308,7 @@
 {
 
        if (FSTYPE_RUMPFS(tc))
-               atf_tc_skip("rename not supported by fs");
+               atf_tc_skip("rename not supported by file system");
 
        USES_DIRS;
 
@@ -345,7 +346,7 @@
        ino_t f1ino, f2ino;
 
        if (FSTYPE_RUMPFS(tc))
-               atf_tc_skip("rename not supported by fs");
+               atf_tc_skip("rename not supported by file system");
 
        if (rump_sys_chdir(mp) == -1)
                atf_tc_fail_errno("chdir mountpoint");
@@ -482,7 +483,7 @@
        size_t len;
 
        if (FSTYPE_RUMPFS(tc))
-               atf_tc_skip("rename not supported by fs");
+               atf_tc_skip("rename not supported by file system");
 
        if (rump_sys_chdir(mp) == -1)
                atf_tc_fail_errno("chdir mountpoint");