Module Name: src
Committed By: njoly
Date: Sat Oct 8 13:08:54 UTC 2011
Modified Files:
src/tests/fs/vfs: t_renamerace.c t_rmdirrace.c t_vnops.c
Log Message:
Slightly adjust skipped messages, makes output more consistent.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/fs/vfs/t_renamerace.c
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/vfs/t_rmdirrace.c
cvs rdiff -u -r1.28 -r1.29 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_renamerace.c
diff -u src/tests/fs/vfs/t_renamerace.c:1.23 src/tests/fs/vfs/t_renamerace.c:1.24
--- src/tests/fs/vfs/t_renamerace.c:1.23 Mon Jul 18 06:47:08 2011
+++ src/tests/fs/vfs/t_renamerace.c Sat Oct 8 13:08:54 2011
@@ -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 @@ renamerace(const atf_tc_t *tc, const cha
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 @@ renamerace_dirs(const atf_tc_t *tc, cons
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))
Index: src/tests/fs/vfs/t_rmdirrace.c
diff -u src/tests/fs/vfs/t_rmdirrace.c:1.7 src/tests/fs/vfs/t_rmdirrace.c:1.8
--- src/tests/fs/vfs/t_rmdirrace.c:1.7 Mon Jul 19 16:00:45 2010
+++ src/tests/fs/vfs/t_rmdirrace.c Sat Oct 8 13:08:54 2011
@@ -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 @@ race(const atf_tc_t *tc, const char *pat
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)
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.28 src/tests/fs/vfs/t_vnops.c:1.29
--- src/tests/fs/vfs/t_vnops.c:1.28 Fri Aug 19 01:25:27 2011
+++ src/tests/fs/vfs/t_vnops.c Sat Oct 8 13:08:54 2011
@@ -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 @@ rename_dir(const atf_tc_t *tc, const cha
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 @@ rename_dotdot(const atf_tc_t *tc, const
{
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 @@ rename_reg_nodir(const atf_tc_t *tc, con
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 @@ rename_nametoolong(const atf_tc_t *tc, c
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");
