Index: projects/zfsd/head/etc/mtree/BSD.tests.dist =================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 329041) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist (revision 329042) @@ -1,1048 +1,1044 @@ # $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 .. 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 .. mdb .. 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 zfs_allow .. zfs_unallow .. .. devices .. exec .. grow_pool .. grow_replicas .. history .. hotplug .. hotspare .. inheritance .. interop .. inuse .. iscsi .. large_files .. largest_pool .. link_count .. mdb .. migration .. mmap - mmap_read - .. - mmap_write - .. .. mount .. mv_files .. nestedfs .. no_space .. online_offline .. pool_names .. poolversion .. privilege .. quota .. redundancy .. refquota .. refreserv .. remote cross_endian .. rebooting .. sharing .. .. 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/mmap/mmap_read/cleanup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/cleanup.ksh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/cleanup.ksh (nonexistent) @@ -1,32 +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 - -default_cleanup Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_001_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_001_pos.ksh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_001_pos.ksh (nonexistent) @@ -1,67 +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 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)mmap_read_001_pos.ksh 1.3 09/01/12 SMI" -# -. $STF_SUITE/include/libtest.kshlib - -########################################################################### -# -# __stc_assertion_start -# -# ID: read_mmap_001_pos -# -# DESCRIPTION: -# read()s from mmap()'ed file contain correct data. -# -# STRATEGY: -# 1. Create a pool & dataset -# 2. Call readmmap binary -# 3. unmount this file system -# 4. Verify the integrity of this pool & dateset -# -# TESTABILITY: explicit -# -# TEST_AUTOMATION_LEVEL: automated -# -# CODING_STATUS: COMPLETED (2005-07-04) -# -# __stc_assertion_end -# -################################################################################ - -verify_runnable "global" - -log_assert "read()s from mmap()'ed file contain correct data." - -log_must $CHMOD 777 $TESTDIR -log_must $READMMAP $TESTDIR/$TESTFILE -log_must $ZFS unmount $TESTPOOL/$TESTFS - -typeset dir=$(get_device_dir $DISKS) -verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir" - -log_pass "read(2) calls from a mmap(2)'ed file succeeded." Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read.cfg (nonexistent) @@ -1,30 +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 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)mmap_read.cfg 1.3 08/08/15 SMI" -# - -export TESTFILE=testfile${TESTCASE_ID} Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/setup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/setup.ksh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/setup.ksh (nonexistent) @@ -1,34 +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 - -DISK=${DISKS%% *} - -default_setup $DISK Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/Makefile (nonexistent) @@ -1,16 +0,0 @@ -# $FreeBSD$ - -.include - -PACKAGE=tests -TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap/mmap_read -FILESDIR=${TESTSDIR} - -ATF_TESTS_KSH93+= mmap_read_test - -${PACKAGE}FILES+= cleanup.ksh -${PACKAGE}FILES+= setup.ksh -${PACKAGE}FILES+= mmap_read_001_pos.ksh -${PACKAGE}FILES+= mmap_read.cfg - -.include Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/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/mmap/mmap_read/mmap_read_test.sh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_test.sh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_test.sh (nonexistent) @@ -1,54 +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 mmap_read_001_pos cleanup -mmap_read_001_pos_head() -{ - atf_set "descr" "read()s from mmap()'ed file contain correct data." - atf_set "require.progs" zfs zdb -} -mmap_read_001_pos_body() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - . $(atf_get_srcdir)/mmap_read.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/mmap_read_001_pos.ksh || atf_fail "Testcase failed" -} -mmap_read_001_pos_cleanup() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - . $(atf_get_srcdir)/mmap_read.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_init_test_cases() -{ - - atf_add_test_case mmap_read_001_pos -} Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_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/mmap/mmap_write/cleanup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/cleanup.ksh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/cleanup.ksh (nonexistent) @@ -1,31 +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 - -default_cleanup Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_test.sh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_test.sh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_test.sh (nonexistent) @@ -1,53 +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 mmap_write_001_pos cleanup -mmap_write_001_pos_head() -{ - atf_set "descr" "write()s to a file and mmap() that file at the same time does notresult in a deadlock." -} -mmap_write_001_pos_body() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - . $(atf_get_srcdir)/mmap_write.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/mmap_write_001_pos.ksh || atf_fail "Testcase failed" -} -mmap_write_001_pos_cleanup() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - . $(atf_get_srcdir)/mmap_write.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_init_test_cases() -{ - - atf_add_test_case mmap_write_001_pos -} Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_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/mmap/mmap_write/mmap_write_001_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_001_pos.ksh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_001_pos.ksh (nonexistent) @@ -1,91 +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 "@(#)mmap_write_001_pos.ksh 1.3 07/07/31 SMI" -# -. $STF_SUITE/include/libtest.kshlib - -# ########################################################################## -# -# __stc_assertion_start -# -# ID: mmap_write_001_pos -# -# DESCRIPTION: -# Writing to a file and mmaping that file at the -# same time does not result in a deadlock. -# -# STRATEGY: -# 1. Make sure this test executes on multi-processes system. -# 2. Call mmapwrite binary. -# 3. wait 120s and make sure the test file existed. -# -# TESTABILITY: explicit -# -# TEST_AUTOMATION_LEVEL: automated -# -# CODING_STATUS: COMPLETED (2005-07-04) -# -# __stc_assertion_end -# -################################################################################ - -verify_runnable "both" - -# Default is 120 seconds or 2 minutes -WAITTIME=${WAITTIME-120} - -log_assert "write()s to a file and mmap() that file at the same time does not "\ - "result in a deadlock." - -# Detect and make sure this test must be executed on a multi-process system -NCPUS=`sysctl -a | awk -F '"' '/cpu count="[0-9+]"/ {print $2; exit}'` -if [[ $? -ne 0 || -z $NCPUS || $NCPUS -le 1 ]]; then - log_unsupported "This test must be executed on a multi-processor system." -fi - -log_must $CHMOD 777 $TESTDIR -$MMAPWRITE $TESTDIR/$TESTFILE & -PID_MMAPWRITE=$! -log_note "$MMAPWRITE $TESTDIR/$TESTFILE pid: $PID_MMAPWRITE" -log_must $SLEEP 10 - -typeset -i i=0 -while (( i < $WAITTIME )); do - if ! $PS -ef | $PGREP $MMAPWRITE > /dev/null ; then - log_must $WAIT $PID_MMAPWRITE - break - fi - $SLEEP 1 - (( i += 1 )) -done - -if $PS -ef | $PGREP $MMAPWRITE > /dev/null ; then - log_must $KILL -9 $PID_MMAPWRITE -fi -log_must $LS -l $TESTDIR/$TESTFILE - -log_pass "write(2) a mmap(2)'ing file succeeded." Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/setup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/setup.ksh (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/setup.ksh (nonexistent) @@ -1,34 +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 - -DISK=${DISKS%% *} - -default_setup $DISK Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write.cfg =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write.cfg (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write.cfg (nonexistent) @@ -1,30 +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 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)mmap_write.cfg 1.3 08/08/15 SMI" -# - -export TESTFILE=testfile${TESTCASE_ID} Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/Makefile (nonexistent) @@ -1,16 +0,0 @@ -# $FreeBSD$ - -.include - -PACKAGE=tests -TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap/mmap_write -FILESDIR=${TESTSDIR} - -ATF_TESTS_KSH93+= mmap_write_test - -${PACKAGE}FILES+= mmap_write_001_pos.ksh -${PACKAGE}FILES+= mmap_write.cfg -${PACKAGE}FILES+= cleanup.ksh -${PACKAGE}FILES+= setup.ksh - -.include Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/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/mmap/Makefile =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile (revision 329041) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/Makefile (revision 329042) @@ -1,10 +1,17 @@ # $FreeBSD$ .include +PACKAGE=tests TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/mmap +FILESDIR=${TESTSDIR} -TESTS_SUBDIRS+= mmap_read -TESTS_SUBDIRS+= mmap_write +ATF_TESTS_KSH93+= mmap_test + +${PACKAGE}FILES+= cleanup.ksh +${PACKAGE}FILES+= mmap.cfg +${PACKAGE}FILES+= mmap_read_001_pos.ksh +${PACKAGE}FILES+= mmap_write_001_pos.ksh +${PACKAGE}FILES+= setup.ksh .include Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/cleanup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/cleanup.ksh (nonexistent) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/cleanup.ksh (revision 329042) @@ -0,0 +1,32 @@ +#!/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 + +default_cleanup Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap.cfg =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap.cfg (nonexistent) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap.cfg (revision 329042) @@ -0,0 +1,30 @@ +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)mmap_read.cfg 1.3 08/08/15 SMI" +# + +export TESTFILE=testfile${TESTCASE_ID} Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh (nonexistent) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read_001_pos.ksh (revision 329042) @@ -0,0 +1,67 @@ +#!/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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)mmap_read_001_pos.ksh 1.3 09/01/12 SMI" +# +. $STF_SUITE/include/libtest.kshlib + +########################################################################### +# +# __stc_assertion_start +# +# ID: read_mmap_001_pos +# +# DESCRIPTION: +# read()s from mmap()'ed file contain correct data. +# +# STRATEGY: +# 1. Create a pool & dataset +# 2. Call readmmap binary +# 3. unmount this file system +# 4. Verify the integrity of this pool & dateset +# +# TESTABILITY: explicit +# +# TEST_AUTOMATION_LEVEL: automated +# +# CODING_STATUS: COMPLETED (2005-07-04) +# +# __stc_assertion_end +# +################################################################################ + +verify_runnable "global" + +log_assert "read()s from mmap()'ed file contain correct data." + +log_must $CHMOD 777 $TESTDIR +log_must $READMMAP $TESTDIR/$TESTFILE +log_must $ZFS unmount $TESTPOOL/$TESTFS + +typeset dir=$(get_device_dir $DISKS) +verify_filesys "$TESTPOOL" "$TESTPOOL/$TESTFS" "$dir" + +log_pass "read(2) calls from a mmap(2)'ed file succeeded." Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh (nonexistent) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh (revision 329042) @@ -0,0 +1,78 @@ +# 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 mmap_read_001_pos cleanup +mmap_read_001_pos_head() +{ + atf_set "descr" "read()s from mmap()'ed file contain correct data." + atf_set "require.progs" zfs zdb +} +mmap_read_001_pos_body() +{ + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/mmap.cfg + + verify_disk_count "$DISKS" 1 + ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" + ksh93 $(atf_get_srcdir)/mmap_read_001_pos.ksh || atf_fail "Testcase failed" +} +mmap_read_001_pos_cleanup() +{ + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/mmap.cfg + + ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" +} + +atf_test_case mmap_write_001_pos cleanup +mmap_write_001_pos_head() +{ + atf_set "descr" "write()s to a file and mmap() that file at the same time does notresult in a deadlock." +} +mmap_write_001_pos_body() +{ + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/mmap.cfg + + verify_disk_count "$DISKS" 1 + ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" + ksh93 $(atf_get_srcdir)/mmap_write_001_pos.ksh || atf_fail "Testcase failed" +} +mmap_write_001_pos_cleanup() +{ + . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/mmap.cfg + + ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" +} + + +atf_init_test_cases() +{ + + atf_add_test_case mmap_read_001_pos + atf_add_test_case mmap_write_001_pos +} Property changes on: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_test.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh (nonexistent) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write_001_pos.ksh (revision 329042) @@ -0,0 +1,91 @@ +#!/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 "@(#)mmap_write_001_pos.ksh 1.3 07/07/31 SMI" +# +. $STF_SUITE/include/libtest.kshlib + +# ########################################################################## +# +# __stc_assertion_start +# +# ID: mmap_write_001_pos +# +# DESCRIPTION: +# Writing to a file and mmaping that file at the +# same time does not result in a deadlock. +# +# STRATEGY: +# 1. Make sure this test executes on multi-processes system. +# 2. Call mmapwrite binary. +# 3. wait 120s and make sure the test file existed. +# +# TESTABILITY: explicit +# +# TEST_AUTOMATION_LEVEL: automated +# +# CODING_STATUS: COMPLETED (2005-07-04) +# +# __stc_assertion_end +# +################################################################################ + +verify_runnable "both" + +# Default is 120 seconds or 2 minutes +WAITTIME=${WAITTIME-120} + +log_assert "write()s to a file and mmap() that file at the same time does not "\ + "result in a deadlock." + +# Detect and make sure this test must be executed on a multi-process system +NCPUS=`sysctl -a | awk -F '"' '/cpu count="[0-9+]"/ {print $2; exit}'` +if [[ $? -ne 0 || -z $NCPUS || $NCPUS -le 1 ]]; then + log_unsupported "This test must be executed on a multi-processor system." +fi + +log_must $CHMOD 777 $TESTDIR +$MMAPWRITE $TESTDIR/$TESTFILE & +PID_MMAPWRITE=$! +log_note "$MMAPWRITE $TESTDIR/$TESTFILE pid: $PID_MMAPWRITE" +log_must $SLEEP 10 + +typeset -i i=0 +while (( i < $WAITTIME )); do + if ! $PS -ef | $PGREP $MMAPWRITE > /dev/null ; then + log_must $WAIT $PID_MMAPWRITE + break + fi + $SLEEP 1 + (( i += 1 )) +done + +if $PS -ef | $PGREP $MMAPWRITE > /dev/null ; then + log_must $KILL -9 $PID_MMAPWRITE +fi +log_must $LS -l $TESTDIR/$TESTFILE + +log_pass "write(2) a mmap(2)'ing file succeeded." Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/setup.ksh =================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/setup.ksh (nonexistent) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/setup.ksh (revision 329042) @@ -0,0 +1,34 @@ +#!/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 + +DISK=${DISKS%% *} + +default_setup $DISK