Index: stable/11/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh =================================================================== --- stable/11/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh (revision 319004) +++ stable/11/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh (revision 319005) @@ -1,103 +1,102 @@ # $NetBSD: t_vnd.sh,v 1.9 2016/07/29 05:23:24 pgoyette Exp $ # # Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. # All rights reserved. # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # # # Verifies that vnd works with files stored in tmpfs. # +# Begin FreeBSD +MD_DEVICE_FILE=md.device +# End FreeBSD + atf_test_case basic cleanup basic_head() { atf_set "descr" "Verifies that vnd works with files stored in tmpfs" atf_set "require.user" "root" } basic_body() { test_mount atf_check -s eq:0 -o ignore -e ignore \ dd if=/dev/zero of=disk.img bs=1m count=10 # Begin FreeBSD if true; then atf_check -s eq:0 -o empty -e empty mkdir mnt - atf_check -s eq:0 -o empty -e empty mdmfs -F disk.img md3 mnt + atf_check -s eq:0 -o empty -e empty mdmfs -F disk.img md mnt + md_dev=$(df mnt | awk 'NR != 1 { print $1 }' | xargs basename) + atf_check test -c /dev/$md_dev # Sanity check + echo -n $md_dev > $TMPDIR/$MD_DEVICE_FILE else # End FreeBSD atf_check -s eq:0 -o empty -e empty vndconfig /dev/vnd3 disk.img atf_check -s eq:0 -o ignore -e ignore newfs /dev/rvnd3a atf_check -s eq:0 -o empty -e empty mkdir mnt atf_check -s eq:0 -o empty -e empty mount /dev/vnd3a mnt # Begin FreeBSD fi # End FreeBSD echo "Creating test files" for f in $(jot -w %u 100 | uniq); do jot 1000 >mnt/${f} || atf_fail "Failed to create file ${f}" done echo "Verifying created files" for f in $(jot -w %u 100 | uniq); do [ $(md5 mnt/${f} | cut -d ' ' -f 4) = \ 53d025127ae99ab79e8502aae2d9bea6 ] || \ atf_fail "Invalid checksum for file ${f}" done atf_check -s eq:0 -o empty -e empty umount mnt - # Begin FreeBSD - if true; then - atf_check -s eq:0 -o empty -e empty mdconfig -d -u 3 - else - # End FreeBSD atf_check -s eq:0 -o empty -e empty vndconfig -u /dev/vnd3 - # Begin FreeBSD - fi - # End FreeBSD test_unmount touch done } basic_cleanup() { + # Begin FreeBSD + if md_dev=$(cat $TMPDIR/$MD_DEVICE_FILE); then + echo "Will try disconnecting $md_dev" + else + echo "$MD_DEVICE_FILE doesn't exist in $TMPDIR; returning early" + return 0 + fi + # End FreeBSD if [ ! -f done ]; then umount mnt 2>/dev/null 1>&2 - # Begin FreeBSD - if true; then - [ ! -c /dev/md3 ] || mdconfig -d -u 3 - else - # End FreeBSD vndconfig -u /dev/vnd3 2>/dev/null 1>&2 - # Begin FreeBSD - fi - # End FreeBSD fi } atf_init_test_cases() { . $(atf_get_srcdir)/../h_funcs.subr . $(atf_get_srcdir)/h_funcs.subr atf_add_test_case basic } Index: stable/11/tests/sys/fs/tmpfs/Makefile =================================================================== --- stable/11/tests/sys/fs/tmpfs/Makefile (revision 319004) +++ stable/11/tests/sys/fs/tmpfs/Makefile (revision 319005) @@ -1,61 +1,64 @@ # $FreeBSD$ PACKAGE= tests FILESYSTEM?= ${.CURDIR:T} TESTSDIR= ${TESTSBASE}/sys/fs/${FILESYSTEM} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/fs/${FILESYSTEM} # XXX: uses /dev/MAKEDEV to create pseudo /dev/{null,zero} character devices #NETBSD_ATF_TESTS_SH+= devices_test NETBSD_ATF_TESTS_SH+= create_test NETBSD_ATF_TESTS_SH+= read_write_test NETBSD_ATF_TESTS_SH+= dots_test NETBSD_ATF_TESTS_SH+= exec_test NETBSD_ATF_TESTS_SH+= link_test NETBSD_ATF_TESTS_SH+= mkdir_test NETBSD_ATF_TESTS_SH+= mknod_test NETBSD_ATF_TESTS_SH+= mount_test # XXX: need to replace `mknod ... p` with something more sensible #NETBSD_ATF_TESTS_SH+= pipes_test NETBSD_ATF_TESTS_SH+= trail_slash_test NETBSD_ATF_TESTS_SH+= readdir_test NETBSD_ATF_TESTS_SH+= remove_test NETBSD_ATF_TESTS_SH+= rename_test NETBSD_ATF_TESTS_SH+= rmdir_test NETBSD_ATF_TESTS_SH+= setattr_test NETBSD_ATF_TESTS_SH+= sizes_test NETBSD_ATF_TESTS_SH+= sockets_test NETBSD_ATF_TESTS_SH+= statvfs_test NETBSD_ATF_TESTS_SH+= symlink_test NETBSD_ATF_TESTS_SH+= times_test NETBSD_ATF_TESTS_SH+= truncate_test NETBSD_ATF_TESTS_SH+= vnd_test NETBSD_ATF_TESTS_SH+= vnode_leak_test ${PACKAGE}FILES+= h_funcs.subr ${PACKAGE}FILESDIR= ${TESTSDIR} PROGS+= h_tools BINDIR.h_tools= ${TESTSDIR} ATF_TESTS_SH_SED_mknod_test= \ -e 's,mknod pipe p,mkfifo pipe,g' \ -e 's,mknod dir/pipe p,mkfifo dir/pipe,g' ATF_TESTS_SH_SED_mount_test= \ -e 's,-o -g,-o gid=,g' \ -e 's,-o -m,-o mode=,g' \ -e 's,-o -s,-o size=,g' \ -e 's,-o -u,-o uid=,g' \ -e 's,mount_${FILESYSTEM},mount -t ${FILESYSTEM},g' ATF_TESTS_SH_SED_readdir_test= -e 's,mknod fifo p,mkfifo fifo,g' ATF_TESTS_SH_SED_sizes_test= -e 's,-o -s,-o size=,g' ATF_TESTS_SH_SED_statvfs_test= -e 's,-o -s,-o size=,g' +ATF_TESTS_SH_SED_vnd_test= \ + -e 's,vndconfig -u /dev/vnd3,mdconfig -d -u $$md_dev,g' \ + -e 's,/dev/vnd3,/dev/$$md_dev,g' ATF_TESTS_SH_SED_vnode_leak_test= -e 's,-o -s,-o size=,g' .include .include Index: stable/11 =================================================================== --- stable/11 (revision 319004) +++ stable/11 (revision 319005) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r318546