Index: projects/zfsd/head/etc/mtree/BSD.tests.dist =================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 329291) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 329292) @@ -1,1032 +1,1030 @@ # $FreeBSD$ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 . bin cat .. chflags .. chmod .. date .. dd .. echo .. expr .. ln .. ls .. mkdir .. mv .. pax .. pkill .. pwait .. rmdir .. sh builtins .. errors .. execution .. expansion .. invocation .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin .. usr.bin ctfconvert .. .. usr.sbin dtrace common aggs .. arithmetic .. arrays .. assocs .. begin .. bitfields .. buffering .. builtinvar .. cg .. clauses .. cpc .. decls .. drops .. dtraceUtil .. end .. env .. enum .. error .. exit .. fbtprovider .. funcs .. grammar .. include .. inline .. io .. ip .. java_api .. json .. lexer .. llquantize .. mib .. misc .. multiaggs .. offsetof .. operators .. pid .. plockstat .. pointers .. pragma .. predicates .. preprocessor .. print .. printa .. printf .. privs .. probes .. proc .. profile-n .. providers .. raise .. rates .. safety .. scalars .. sched .. scripting .. sdt .. sizeof .. speculation .. stability .. stack .. stackdepth .. stop .. strlen .. strtoll .. struct .. sugar .. syscall .. sysevent .. tick-n .. trace .. tracemem .. translators .. typedef .. types .. uctf .. union .. usdt .. ustack .. vars .. version .. .. .. zfsd .. .. .. etc rc.d .. .. games .. gnu lib .. usr.bin diff .. .. .. lib atf libatf-c detail .. .. libatf-c++ detail .. .. test-programs .. .. libarchive .. libc c063 .. db .. gen execve .. posix_spawn .. .. hash data .. .. iconv .. inet .. locale .. net getaddrinfo data .. .. .. nss .. regex data .. .. resolv .. rpc .. ssp .. setjmp .. stdio .. stdlib .. string .. sys .. time .. tls dso .. .. termios .. ttyio .. .. libcam .. libcasper services cap_dns .. cap_grp .. cap_pwd .. cap_sysctl .. .. .. libcrypt .. libdevdctl .. libkvm .. libmp .. libnv .. libproc .. libregex data .. .. librt .. libsbuf .. libthr dlopen .. .. libutil .. libxo .. msun .. .. libexec atf atf-check .. atf-sh .. .. rtld-elf .. .. sbin dhclient .. devd .. growfs .. ifconfig .. mdconfig .. pfctl files .. .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. plain .. tap .. .. .. zoneinfo .. .. sys acl .. aio .. cddl zfs bin .. include .. tests acl cifs .. nontrivial .. trivial .. .. atime .. bootfs .. cache .. cachefile .. clean_mirror .. cli_root zfs_upgrade .. zfs_promote .. zfs_clone .. zfs_property .. zfs_destroy .. zpool_create .. zpool_history .. zpool_expand .. zpool_remove .. zfs_mount .. zfs_unshare .. zdb .. zpool_online .. zpool_get .. zpool_export .. zfs_copies .. zfs_get .. zfs .. zpool_clear .. zpool_import blockfiles .. .. zpool .. zpool_offline .. zpool_replace .. zfs_rollback .. zpool_set .. zfs_send .. zfs_set .. zpool_detach .. zfs_diff .. zpool_scrub .. zfs_inherit .. zfs_snapshot .. zfs_share .. zpool_destroy .. zpool_status .. zfs_unmount .. zfs_receive .. zfs_create .. zpool_upgrade blockfiles .. .. zpool_add .. zfs_rename .. zpool_attach .. zfs_reservation .. .. cli_user misc .. zfs_list .. zpool_iostat .. zpool_list .. .. compression .. ctime .. delegate .. devices .. exec .. grow_pool .. grow_replicas .. history .. hotplug .. hotspare .. inheritance .. interop .. inuse .. iscsi .. large_files .. largest_pool .. link_count .. mdb .. migration .. mmap .. mount .. mv_files .. nestedfs .. no_space .. online_offline .. pool_names .. poolversion .. - privilege - .. quota .. redundancy .. refquota .. refreserv .. rename_dirs .. replacement .. reservation .. rootpool .. rsend .. scrub_mirror .. slog .. snapshot .. snapused .. sparse .. threadsappend .. truncate .. txg_integrity .. userquota .. utils_test .. write_dirs .. xattr .. zfsd .. zil .. zinject .. zones .. zvol zvol_ENOSPC .. zvol_cli .. zvol_misc .. zvol_swap .. .. zvol_thrash .. .. .. .. dtrace .. fifo .. file .. fs tmpfs .. .. geom class concat .. eli .. gate .. gpt .. mirror .. nop .. part .. raid3 .. shsec .. stripe .. uzip etalon .. .. .. .. kern acct .. execve .. pipe .. .. kqueue libkqueue .. .. mac bsdextended .. portacl .. .. mqueue .. net .. netinet .. netipsec tunnel .. .. netpfil pf .. .. opencrypto .. pjdfstest chflags .. chmod .. chown .. ftruncate .. granular .. link .. mkdir .. mkfifo .. mknod .. open .. rename .. rmdir .. symlink .. truncate .. unlink .. utimensat .. .. posixshm .. sys .. vfs .. vm .. .. usr.bin apply .. awk .. basename .. bmake archives fmt_44bsd .. fmt_44bsd_mod .. fmt_oldbsd .. .. basic t0 .. t1 .. t2 .. t3 .. .. execution ellipsis .. empty .. joberr .. plus .. .. shell builtin .. meta .. path .. path_select .. replace .. select .. .. suffixes basic .. src_wild1 .. src_wild2 .. .. syntax directive-t0 .. enl .. funny-targets .. semi .. .. sysmk t0 2 1 .. .. mk .. .. t1 2 1 .. .. mk .. .. t2 2 1 .. .. mk .. .. .. variables modifier_M .. modifier_t .. opt_V .. t0 .. .. .. bsdcat .. calendar .. cmp .. compress .. cpio .. col .. comm .. csplit .. cut .. dc .. diff .. dirname .. du .. file2c .. find .. fold .. getconf .. grep .. gzip .. head .. hexdump .. ident .. indent .. join .. jot .. lastcomm .. limits .. m4 .. mkimg .. ncal .. opensm .. pr .. printf .. procstat .. rs .. sdiff .. sed regress.multitest.out .. .. soelim .. stat .. tail .. tar .. timeout .. tr .. truncate .. units .. uudecode .. uuencode .. uniq .. vmstat .. xargs .. xinstall .. xo .. yacc yacc .. .. .. usr.sbin chown .. etcupdate .. extattr .. fstyp .. makefs .. newsyslog .. nmtree .. pw .. rpcbind .. sa .. .. .. # vim: set expandtab ts=4 sw=4: Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh (nonexistent) @@ -1,78 +0,0 @@ -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2012 Spectra Logic. All rights reserved. -# Use is subject to license terms. -# - - -atf_test_case privilege_001_pos cleanup -privilege_001_pos_head() -{ - atf_set "descr" "The RBAC profile \ZFS Storage Management\ works" - atf_set "require.progs" pfexec svcadm zfs zpool svcs -} -privilege_001_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/privilege.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/privilege_001_pos.ksh || atf_fail "Testcase failed" -} -privilege_001_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/privilege.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case privilege_002_pos cleanup -privilege_002_pos_head() -{ - atf_set "descr" "The RBAC profile \ZFS File System Management\ works" - atf_set "require.progs" pfexec svcadm zfs zpool svcs -} -privilege_002_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/privilege.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/privilege_002_pos.ksh || atf_fail "Testcase failed" -} -privilege_002_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/privilege.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_init_test_cases() -{ - - atf_add_test_case privilege_001_pos - atf_add_test_case privilege_002_pos -} Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/cleanup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/cleanup.ksh (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/cleanup.ksh (nonexistent) @@ -1,45 +0,0 @@ -#!/usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)cleanup.ksh 1.2 07/01/09 SMI" -# - -. ${STF_SUITE}/include/libtest.kshlib -. ${STF_SUITE}/tests/privilege/privilege.cfg - -verify_runnable "global" - -if [ "${USES_NIS}" == "true" ] -then - $SVCADM enable svc:/network/nis/client:default -fi - -$USERDEL $ZFS_USER -$RM -rf /export/home/$ZFS_USER -$RM $TMPDIR/zfs-privs-test-nis.txt -$RM $TMPDIR/zfs-privs-test-user.txt - -default_cleanup Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_001_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_001_pos.ksh (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_001_pos.ksh (nonexistent) @@ -1,101 +0,0 @@ -#! /usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)privilege_001_pos.ksh 1.3 07/03/14 SMI" -# - -. $STF_SUITE/include/libtest.kshlib - -################################################################################ -# -# __stc_assertion_start -# -# ID: privilege_001_pos -# -# DESCRIPTION: -# -# The RBAC profile "ZFS Storage Management" works -# -# STRATEGY: -# (create) -# 1. As a normal user, try to create a pool - which should fail. -# 2. Assign "ZFS Storage Management" profile, try to create pool again, -# which should succeed. -# -# (works well with other ZFS profile tests) -# 3. Attempt to create a ZFS filesystem, which should fail. -# 4. Add the "ZFS File System Management" profile, attempt to create a FS -# which should succeed. -# -# (destroy) -# 5. Remove the FS profile, then attempt to destroy the pool, which -# should succeed. -# 6. Remove the Storage profile, then attempt to recreate the pool, which -# should fail. -# -# TESTABILITY: explicit -# -# TEST_AUTOMATION_LEVEL: automated -# -# CODING_STATUS: COMPLETED (2006-08-16) -# -# __stc_assertion_end -# -################################################################################ - -# We can only run this in the global zone -verify_runnable "global" - -log_assert "The RBAC profile \"ZFS Storage Management\" works" - -# the user shouldn't be able to do anything initially -log_mustnot $SU $ZFS_USER -c "$ZPOOL create $TESTPOOL $DISKS" -log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZPOOL create $TESTPOOL $DISKS" - -# the first time we assign the profile, we insist it should work -log_must $USERMOD -P "ZFS Storage Management" $ZFS_USER -log_must $SU $ZFS_USER -c "$PFEXEC $ZPOOL create -f $TESTPOOL $DISKS" - -# ensure the user can't create a filesystem with this profile -log_mustnot $SU $ZFS_USER -c "$ZFS create $TESTPOOL/fs" - -# add ZFS File System Management profile, and try to create a fs -log_must $USERMOD -P "ZFS File System Management" $ZFS_USER -log_must $SU $ZFS_USER -c "$PFEXEC $ZFS create $TESTPOOL/fs" - -# revoke File System Management profile -$USERMOD -P, $ZFS_USER -$USERMOD -P "ZFS Storage Management" $ZFS_USER - -# ensure the user can destroy pools -log_mustnot $SU $ZFS_USER -c "$ZPOOL destroy $TESTPOOL" -log_must $SU $ZFS_USER -c "$PFEXEC $ZPOOL destroy $TESTPOOL" - -# revoke Storage Management profile -$USERMOD -P, $ZFS_USER -log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZPOOL create -f $TESTPOOL $DISKS" - -log_pass "The RBAC profile \"ZFS Storage Management\" works" Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_002_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_002_pos.ksh (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_002_pos.ksh (nonexistent) @@ -1,111 +0,0 @@ -#! /usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)privilege_002_pos.ksh 1.3 07/03/14 SMI" -# - -. $STF_SUITE/include/libtest.kshlib - -################################################################################ -# -# __stc_assertion_start -# -# ID: privilege_002_pos -# -# DESCRIPTION: -# -# The RBAC profile "ZFS File System Management" works -# -# STRATEGY: -# -# The following actions are taken, both using profile execution (pfexec) -# and without profile execution - we make sure that the latter should -# always fail. -# -# (create) -# 1. As a normal user, try to create a filesystem - which should fail. -# 2. Assign "ZFS File System Management" profile, try to create fs again, -# which should succeed. -# -# (pools) -# 3. Ensure a user with this profile can't perform pool administration -# by attempting to destroy a pool. -# -# (destroy) -# 5. Remove the FS profile, then attempt to destroy the fs, which -# should fail. -# 6. Assign the FS profile, then attempt to destroy the fs, which -# should succeed. -# -# TESTABILITY: explicit -# -# TEST_AUTOMATION_LEVEL: automated -# -# CODING_STATUS: COMPLETED (2006-08-16) -# -# __stc_assertion_end -# -################################################################################ - -verify_runnable "both" - -log_assert "The RBAC profile \"ZFS File System Management\" works" - -# Set a $DATASET where we can create child files systems -if is_global_zone; then - log_must $ZPOOL create -f $TESTPOOL $DISKS - DATASET=$TESTPOOL -else - DATASET=zonepool/zonectr0 -fi - -# A user shouldn't be able to create filesystems -log_mustnot $SU $ZFS_USER -c "$ZFS create $DATASET/zfsprivfs" - -# Insist this invocation of usermod works -log_must $USERMOD -P "ZFS File System Management" $ZFS_USER - -# Now try to create file systems as the user -log_mustnot $SU $ZFS_USER -c "$ZFS create $DATASET/zfsprivfs" -log_must $SU $ZFS_USER -c "$PFEXEC $ZFS create $DATASET/zfsprivfs" - -# Ensure the user can't do anything to pools in this state: -log_mustnot $SU $ZFS_USER -c "$ZPOOL destroy $DATASET" -log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZPOOL destroy $DATASET" - -# revoke File System Management profile -$USERMOD -P, $ZFS_USER - -# Ensure the user can't create more filesystems -log_mustnot $SU $ZFS_USER -c "$ZFS create $DATASET/zfsprivfs2" -log_mustnot $SU $ZFS_USER -c "$PFEXEC $ZFS create $DATASET/zfsprivfs2" - -# assign the profile again and destroy the fs. -$USERMOD -P "ZFS File System Management" $ZFS_USER -log_must $SU $ZFS_USER -c "$PFEXEC $ZFS destroy $DATASET/zfsprivfs" -$USERMOD -P, $ZFS_USER - -log_pass "The RBAC profile \"ZFS File System Management\" works" Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/setup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/setup.ksh (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/setup.ksh (nonexistent) @@ -1,65 +0,0 @@ -#!/usr/local/bin/ksh93 -p -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)setup.ksh 1.2 07/01/09 SMI" -# - -. ${STF_SUITE}/include/libtest.kshlib -. ${STF_SUITE}/tests/privilege/privilege.cfg - - -# if we're running NIS, turn it off until we clean up -# (it can cause useradd to take a long time, hitting our TIMEOUT) -$SVCS svc:/network/nis/client:default | $GREP online > /dev/null -if [ $? -eq 0 ] -then - $SVCADM disable svc:/network/nis/client:default - USES_NIS=true -fi - - -# create a unique user that we can use to run the tests, -# making sure not to clobber any existing users. -FOUND="" -while [ -z "${FOUND}" ] -do - USER_EXISTS=$( grep $ZFS_USER /etc/passwd ) - if [ ! -z "${USER_EXISTS}" ] - then - ZFS_USER="${ZFS_USER}x" - else - FOUND="true" - fi -done - -$MKDIR -p /export/home/$ZFS_USER -$USERADD -c "ZFS Privileges Test User" -d /export/home/$ZFS_USER $ZFS_USER - -print $ZFS_USER > $TMPDIR/zfs-privs-test-user.txt -print $USES_NIS > $TMPDIR/zfs-privs-test-nis.txt -print ZFS_USER is $ZFS_USER -print USES_NIS is $USES_NIS -log_pass Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege.cfg =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege.cfg (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege.cfg (nonexistent) @@ -1,49 +0,0 @@ -# vim: filetype=sh -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)privilege.cfg 1.3 07/03/14 SMI" -# - -# a variable we set during setup to indicate whether we need to -# re-enable the nis/client during cleanup. -USES_NIS=false - -# A username we can create for the course of the zfs privileges -# testing (modified by setup if it already exists) -ZFS_USER=zfsrbac - -# These variables may also have been tweaked by the setup script -# Let's import them if necessary. -if [ -f $TMPDIR/zfs-privs-test-nis.txt ]; then - USES_NIS=$($CAT $TMPDIR/zfs-privs-test-nis.txt) -fi - -if [ -f $TMPDIR/zfs-privs-test-user.txt ]; then - ZFS_USER=$($CAT $TMPDIR/zfs-privs-test-user.txt) -fi - -export ZFS_USER -export USES_NIS Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile (nonexistent) @@ -1,18 +0,0 @@ -# $FreeBSD$ - -.include - -PACKAGE=tests -TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/privilege -FILESDIR=${TESTSDIR} - -ATF_TESTS_KSH93+= privilege_test -TEST_METADATA+= required_user="root" - -${PACKAGE}FILES+= privilege_001_pos.ksh -${PACKAGE}FILES+= setup.ksh -${PACKAGE}FILES+= privilege.cfg -${PACKAGE}FILES+= cleanup.ksh -${PACKAGE}FILES+= privilege_002_pos.ksh - -.include Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/Makefile ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile (revision 329291) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/Makefile (revision 329292) @@ -1,90 +1,89 @@ # $FreeBSD$ .include PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/cddl/zfs/tests TESTS_SUBDIRS+= acl TESTS_SUBDIRS+= atime TESTS_SUBDIRS+= bootfs TESTS_SUBDIRS+= cache TESTS_SUBDIRS+= cachefile TESTS_SUBDIRS+= clean_mirror TESTS_SUBDIRS+= cli_root TESTS_SUBDIRS+= cli_user TESTS_SUBDIRS+= compression TESTS_SUBDIRS+= ctime TESTS_SUBDIRS+= delegate TESTS_SUBDIRS+= devices TESTS_SUBDIRS+= exec TESTS_SUBDIRS+= grow_pool TESTS_SUBDIRS+= grow_replicas TESTS_SUBDIRS+= history TESTS_SUBDIRS+= hotplug TESTS_SUBDIRS+= hotspare TESTS_SUBDIRS+= inheritance # Not yet ported to FreeBSD # TESTS_SUBDIRS+= interop TESTS_SUBDIRS+= inuse # Not yet ported to FreeBSD # TESTS_SUBDIRS+= iscsi TESTS_SUBDIRS+= large_files # Not yet ported to FreeBSD # TESTS_SUBDIRS+= largest_pool # link_count is not yet ported to FreeBSD. I'm not sure what its purpose is. # The assertion message contradicts with the log_fail message. # TESTS_SUBDIRS+= link_count TESTS_SUBDIRS+= migration TESTS_SUBDIRS+= mmap TESTS_SUBDIRS+= mount TESTS_SUBDIRS+= mv_files TESTS_SUBDIRS+= nestedfs TESTS_SUBDIRS+= no_space TESTS_SUBDIRS+= online_offline TESTS_SUBDIRS+= pool_names TESTS_SUBDIRS+= poolversion -TESTS_SUBDIRS+= privilege TESTS_SUBDIRS+= quota TESTS_SUBDIRS+= redundancy TESTS_SUBDIRS+= refquota TESTS_SUBDIRS+= refreserv # Broken on every OS # TESTS_SUBDIRS+= rename_dirs TESTS_SUBDIRS+= replacement TESTS_SUBDIRS+= reservation TESTS_SUBDIRS+= rootpool # Not yet ported to FreeBSD # TESTS_SUBDIRS+= rsend TESTS_SUBDIRS+= scrub_mirror TESTS_SUBDIRS+= slog TESTS_SUBDIRS+= snapshot TESTS_SUBDIRS+= snapused TESTS_SUBDIRS+= sparse TESTS_SUBDIRS+= threadsappend TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= txg_integrity TESTS_SUBDIRS+= userquota TESTS_SUBDIRS+= utils_test TESTS_SUBDIRS+= write_dirs # Not yet ported to FreeBSD # TESTS_SUBDIRS+= xattr TESTS_SUBDIRS+= zfsd TESTS_SUBDIRS+= zil # Not yet ported to FreeBSD # TESTS_SUBDIRS+= zinject # Not yet ported to FreeBSD # TESTS_SUBDIRS+= zones TESTS_SUBDIRS+= zvol TESTS_SUBDIRS+= zvol_thrash # This is primarily useful for identifying which test a testid corresponds to. # Sometimes all you might have is a pool name like 'testpool.1316'. testids: for i in `find ${.CURDIR} -name '*.sh' | xargs grep '^atf_test_case '|awk '{print $$2}'`; do \ echo "$${i}: $$(echo $$i | cksum -o 2 | cut -d" " -f1)"; \ done .PHONY: testids .include