[src/trunk]: src/tests/fs Have to hijack sysctl() and modctl() for zfs commands.

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

details:   https://anonhg.NetBSD.org/src/rev/4aed7a99dedd
branches:  trunk
changeset: 995336:4aed7a99dedd
user:      hannken <hannken%NetBSD.org@localhost>
date:      Sun Dec 16 14:04:14 2018 +0000

description:
Have to hijack sysctl() and modctl() for zfs commands.

Should fix PR kern/53422

diffstat:

 tests/fs/common/fstest_zfs.c |  6 +++---
 tests/fs/zfs/t_zpool.sh      |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r dac060e9a90e -r 4aed7a99dedd tests/fs/common/fstest_zfs.c
--- a/tests/fs/common/fstest_zfs.c      Sun Dec 16 14:03:37 2018 +0000
+++ b/tests/fs/common/fstest_zfs.c      Sun Dec 16 14:04:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstest_zfs.c,v 1.1 2012/08/20 16:37:35 pooka Exp $     */
+/*     $NetBSD: fstest_zfs.c,v 1.2 2018/12/16 14:04:14 hannken Exp $   */
 
 /*-
  * Copyright (c) 2010, 2011  The NetBSD Foundation, Inc.
@@ -104,8 +104,8 @@
 
        /* set up the hijack env for running zpool */
        setenv("RUMP_SERVER", SRVURL, 1);
-       snprintf(tmpbuf, sizeof(tmpbuf)-1, "blanket=/dev/zfs:%s:%s",
-           ZFSDEV, path);
+       snprintf(tmpbuf, sizeof(tmpbuf)-1,
+           "blanket=/dev/zfs:%s:%s,sysctl=yes,modctl=yes", ZFSDEV, path);
        setenv("RUMPHIJACK", tmpbuf, 1);
        setenv("LD_PRELOAD", "/usr/lib/librumphijack.so", 1);
 
diff -r dac060e9a90e -r 4aed7a99dedd tests/fs/zfs/t_zpool.sh
--- a/tests/fs/zfs/t_zpool.sh   Sun Dec 16 14:03:37 2018 +0000
+++ b/tests/fs/zfs/t_zpool.sh   Sun Dec 16 14:04:14 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_zpool.sh,v 1.3 2011/12/06 18:18:59 njoly Exp $
+#      $NetBSD: t_zpool.sh,v 1.4 2018/12/16 14:04:14 hannken Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -46,7 +46,7 @@
        atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER}
 
        export LD_PRELOAD=/usr/lib/librumphijack.so
-       export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo
+       export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo,sysctl=yes,modctl=yes
        atf_check -s exit:0 zpool create jippo /dk
 
        export RUMPHIJACK=vfs=all