Index: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh =================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh (revision 312297) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh (revision 312298) @@ -1,159 +1,143 @@ # $NetBSD: t_mknod.sh,v 1.5 2010/11/07 17:51:18 jmmv Exp $ # # Copyright (c) 2005, 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 the mknod operation works. # atf_test_case block block_head() { atf_set "descr" "Tests that block devices can be created" atf_set "require.user" "root" } block_body() { test_mount umask 022 atf_check -s eq:0 -o empty -e empty mknod fd0a b 2 0 eval $(stat -s fd0a) [ ${st_mode} = 060644 ] || atf_fail "Invalid mode" [ ${st_rdev} -eq 512 ] || atf_fail "Invalid device" test_unmount } atf_test_case block_kqueue block_kqueue_head() { atf_set "descr" "Tests that creating a block device raises the" \ "appropriate kqueue events" atf_set "require.user" "root" } block_kqueue_body() { test_mount umask 022 atf_check -s eq:0 -o empty -e empty mkdir dir echo 'mknod dir/fd0a b 2 0' | kqueue_monitor 1 dir kqueue_check dir NOTE_WRITE test_unmount } atf_test_case char char_head() { atf_set "descr" "Tests that character devices can be created" atf_set "require.user" "root" } char_body() { test_mount umask 022 atf_check -s eq:0 -o empty -e empty mknod null c 2 2 eval $(stat -s null) [ ${st_mode} = 020644 ] || atf_fail "Invalid mode" [ ${st_rdev} -eq 514 ] || atf_fail "Invalid device" test_unmount } atf_test_case char_kqueue char_kqueue_head() { atf_set "descr" "Tests that creating a character device raises the" \ "appropriate kqueue events" atf_set "require.user" "root" } char_kqueue_body() { test_mount umask 022 atf_check -s eq:0 -o empty -e empty mkdir dir echo 'mknod dir/null c 2 2' | kqueue_monitor 1 dir kqueue_check dir NOTE_WRITE test_unmount } atf_test_case pipe pipe_head() { atf_set "descr" "Tests that named pipes can be created" atf_set "require.user" "root" } pipe_body() { test_mount umask 022 - # Begin FreeBSD - if true; then - atf_check -s eq:0 -o empty -e empty mkfifo pipe - else - # End FreeBSD atf_check -s eq:0 -o empty -e empty mknod pipe p - # Begin FreeBSD - fi - # End FreeBSD eval $(stat -s pipe) [ ${st_mode} = 010644 ] || atf_fail "Invalid mode" test_unmount } atf_test_case pipe_kqueue pipe_kqueue_head() { atf_set "descr" "Tests that creating a named pipe raises the" \ "appropriate kqueue events" atf_set "require.user" "root" } pipe_kqueue_body() { test_mount umask 022 atf_check -s eq:0 -o empty -e empty mkdir dir - # Begin FreeBSD - if true; then - echo 'mkfifo dir/pipe' | kqueue_monitor 1 dir - else - # End FreeBSD echo 'mknod dir/pipe p' | kqueue_monitor 1 dir - # Begin FreeBSD - fi - # End FreeBSD kqueue_check dir NOTE_WRITE test_unmount } atf_init_test_cases() { . $(atf_get_srcdir)/../h_funcs.subr . $(atf_get_srcdir)/h_funcs.subr atf_add_test_case block atf_add_test_case block_kqueue atf_add_test_case char atf_add_test_case char_kqueue atf_add_test_case pipe atf_add_test_case pipe_kqueue } Index: projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile =================================================================== --- projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile (revision 312297) +++ projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile (revision 312298) @@ -1,57 +1,61 @@ # $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_vnode_leak_test= -e 's,-o -s,-o size=,g' .include .include