[src/trunk]: src/tests/fs/vfs Mark a bunch of routinely-broken ZFS tests as e...

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

details:   https://anonhg.NetBSD.org/src/rev/766307c07bfb
branches:  trunk
changeset: 785487:766307c07bfb
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Mar 16 05:45:37 2013 +0000

description:
Mark a bunch of routinely-broken ZFS tests as expected failures.  Point
them at PR kern/47656.

diffstat:

 tests/fs/vfs/t_full.c   |   4 +++-
 tests/fs/vfs/t_unpriv.c |  10 +++++++++-
 tests/fs/vfs/t_vnops.c  |  13 ++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diffs (118 lines):

diff -r 2556f65153ee -r 766307c07bfb tests/fs/vfs/t_full.c
--- a/tests/fs/vfs/t_full.c     Sat Mar 16 05:24:59 2013 +0000
+++ b/tests/fs/vfs/t_full.c     Sat Mar 16 05:45:37 2013 +0000
@@ -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 @@
                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");
diff -r 2556f65153ee -r 766307c07bfb tests/fs/vfs/t_unpriv.c
--- a/tests/fs/vfs/t_unpriv.c   Sat Mar 16 05:24:59 2013 +0000
+++ b/tests/fs/vfs/t_unpriv.c   Sat Mar 16 05:45:37 2013 +0000
@@ -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 @@
        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 @@
        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 @@
        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 @@
 
        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");
diff -r 2556f65153ee -r 766307c07bfb tests/fs/vfs/t_vnops.c
--- a/tests/fs/vfs/t_vnops.c    Sat Mar 16 05:24:59 2013 +0000
+++ b/tests/fs/vfs/t_vnops.c    Sat Mar 16 05:45:37 2013 +0000
@@ -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 @@
        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 @@
        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 @@
 
        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 @@
        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 @@
 
                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];