Module Name:    src
Committed By:   jmmv
Date:           Sat Mar 16 05:25:00 UTC 2013

Modified Files:
        src/tests/fs/common: h_fsmacros.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/tests/fs/common/h_fsmacros.h

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/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.36 src/tests/fs/common/h_fsmacros.h:1.37
--- src/tests/fs/common/h_fsmacros.h:1.36	Mon Aug 20 16:39:46 2012
+++ src/tests/fs/common/h_fsmacros.h	Sat Mar 16 05:24:59 2013
@@ -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 @@ do {									\
 		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 @@ do {									\
 		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;					\
 									\

Reply via email to