Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/fs/common Mark the zfs tests as requiring root.



details:   https://anonhg.NetBSD.org/src/rev/2556f65153ee
branches:  trunk
changeset: 785486:2556f65153ee
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Mar 16 05:24:59 2013 +0000

description:
Mark the zfs tests as requiring root.

This is wrong.  The zfs tests already use rump so they should not require
root.  However, I've already spent much more time than I wanted trying to
figure out why that's the case without much luck.  If you can find why,
just remove this hack.

diffstat:

 tests/fs/common/h_fsmacros.h |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 1f1b8d118331 -r 2556f65153ee tests/fs/common/h_fsmacros.h
--- a/tests/fs/common/h_fsmacros.h      Sat Mar 16 04:21:19 2013 +0000
+++ b/tests/fs/common/h_fsmacros.h      Sat Mar 16 05:24:59 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: h_fsmacros.h,v 1.36 2012/08/20 16:39:46 pooka Exp $    */
+/*     $NetBSD: h_fsmacros.h,v 1.37 2013/03/16 05:24:59 jmmv Exp $     */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -109,6 +109,10 @@
                atf_tc_set_md_var(tc, "descr", type " test for " desc); \
                atf_tc_set_md_var(tc, "X-fs.type", #fs);                \
                atf_tc_set_md_var(tc, "X-fs.mntname", type);            \
+               if (strcmp(#fs, "zfs") == 0) {                          \
+                       /* This should not be necessary. */             \
+                       atf_tc_set_md_var(tc, "require.user", "root");  \
+               }                                                       \
        }                                                               \
        void *fs##func##tmp;                                            \
                                                                        \
@@ -131,6 +135,10 @@
                atf_tc_set_md_var(tc, "descr",_type_" test for "_desc_);\
                atf_tc_set_md_var(tc, "X-fs.type", #_fs_);              \
                atf_tc_set_md_var(tc, "X-fs.mntname", _type_);          \
+               if (strcmp(#_fs_, "zfs") == 0) {                        \
+                       /* This should not be necessary. */             \
+                       atf_tc_set_md_var(tc, "require.user", "root");  \
+               }                                                       \
        }                                                               \
        void *_fs_##_func_##tmp;                                        \
                                                                        \



Home | Main Index | Thread Index | Old Index