Module Name: src
Committed By: jmmv
Date: Sat Mar 16 05:45:37 UTC 2013
Modified Files:
src/tests/fs/vfs: t_full.c t_unpriv.c t_vnops.c
Log Message:
Mark a bunch of routinely-broken ZFS tests as expected failures. Point
them at PR kern/47656.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/vfs/t_full.c
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_unpriv.c
cvs rdiff -u -r1.33 -r1.34 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.7 src/tests/fs/vfs/t_full.c:1.8
--- src/tests/fs/vfs/t_full.c:1.7 Thu Mar 17 19:48:37 2011
+++ src/tests/fs/vfs/t_full.c Sat Mar 16 05:45:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_full.c,v 1.7 2011/03/17 19:48:37 jmmv Exp $ */
+/* $NetBSD: t_full.c,v 1.8 2013/03/16 05:45:37 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -77,6 +77,8 @@ fillfs(const atf_tc_t *tc, const char *m
if (n == -1)
break;
}
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (n == -1) {
if (errno != ENOSPC)
atf_tc_fail_errno("write");
Index: src/tests/fs/vfs/t_unpriv.c
diff -u src/tests/fs/vfs/t_unpriv.c:1.9 src/tests/fs/vfs/t_unpriv.c:1.10
--- src/tests/fs/vfs/t_unpriv.c:1.9 Wed Apr 4 18:53:34 2012
+++ src/tests/fs/vfs/t_unpriv.c Sat Mar 16 05:45:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unpriv.c,v 1.9 2012/04/04 18:53:34 njoly Exp $ */
+/* $NetBSD: t_unpriv.c,v 1.10 2013/03/16 05:45:37 jmmv Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -54,6 +54,8 @@ owner(const atf_tc_t *tc, const char *mp
rump_pub_lwproc_rfork(RUMP_RFCFDG);
if (rump_sys_setuid(1) == -1)
atf_tc_fail_errno("setuid");
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (rump_sys_chown(".", 1, -1) != -1 || errno != EPERM)
atf_tc_fail_errno("chown");
if (rump_sys_chmod(".", 0000) != -1 || errno != EPERM)
@@ -93,6 +95,8 @@ dirperms(const atf_tc_t *tc, const char
rump_pub_lwproc_rfork(RUMP_RFCFDG);
if (rump_sys_setuid(1) == -1)
atf_tc_fail_errno("setuid");
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (rump_sys_open(name, O_RDWR|O_CREAT, 0666) != -1 || errno != EACCES)
atf_tc_fail_errno("open");
rump_pub_lwproc_releaselwp();
@@ -135,6 +139,8 @@ times(const atf_tc_t *tc, const char *mp
rump_pub_lwproc_rfork(RUMP_RFCFDG);
if (rump_sys_setuid(1) == -1)
atf_tc_fail_errno("setuid");
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (rump_sys_utimes(name, NULL) != -1 || errno != EACCES)
atf_tc_fail_errno("utimes");
rump_pub_lwproc_releaselwp();
@@ -174,6 +180,8 @@ flags(const atf_tc_t *tc, const char *mp
if (rump_sys_stat(name, &st) == -1)
atf_tc_fail_errno("stat");
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (rump_sys_chflags(name, st.st_flags) == -1) {
if (errno == EOPNOTSUPP)
atf_tc_skip("file flags not supported by file system");
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.33 src/tests/fs/vfs/t_vnops.c:1.34
--- src/tests/fs/vfs/t_vnops.c:1.33 Tue Mar 20 18:20:49 2012
+++ src/tests/fs/vfs/t_vnops.c Sat Mar 16 05:45:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.33 2012/03/20 18:20:49 njoly Exp $ */
+/* $NetBSD: t_vnops.c,v 1.34 2013/03/16 05:45:37 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -142,6 +142,8 @@ dir_notempty(const atf_tc_t *tc, const c
rump_sys_close(fd);
rv = rump_sys_rmdir(pb);
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (rv != -1 || errno != ENOTEMPTY)
atf_tc_fail("non-empty directory removed succesfully");
@@ -237,6 +239,8 @@ rename_dir(const atf_tc_t *tc, const cha
md(pb1, mp, "dir3/.");
if (rump_sys_rename(pb1, pb3) != -1 || errno != EINVAL)
atf_tc_fail_errno("rename 2");
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (rump_sys_rename(pb3, pb1) != -1 || errno != EISDIR)
atf_tc_fail_errno("rename 3");
@@ -563,6 +567,8 @@ attrs(const atf_tc_t *tc, const char *mp
RL(rump_sys_stat(TESTFILE, &sb2));
#define CHECK(a) ATF_REQUIRE_EQ(sb.a, sb2.a)
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
CHECK(st_uid);
CHECK(st_gid);
@@ -601,6 +607,8 @@ fcntl_lock(const atf_tc_t *tc, const cha
RL(rump_sys_ftruncate(fd, 8192));
/* PR kern/43321 */
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be broken");
RL(rump_sys_fcntl(fd, F_SETLK, &l));
/* Next, we fork and try to lock the same area */
@@ -734,6 +742,9 @@ fcntl_getlock_pids(const atf_tc_t *tc, c
RL(rump_sys_ftruncate(fd[i], sz));
+ if (FSTYPE_ZFS(tc))
+ atf_tc_expect_fail("PR kern/47656: Test known to be "
+ "broken");
if (i < __arraycount(lock)) {
RL(rump_sys_fcntl(fd[i], F_SETLK, &lock[i]));
expect[i].l_pid = pid[i];
