summaryrefslogtreecommitdiffstats
path: root/contrib/netbsd-tests/fs/tmpfs
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/netbsd-tests/fs/tmpfs')
-rwxr-xr-xcontrib/netbsd-tests/fs/tmpfs/t_mknod.sh16
-rwxr-xr-xcontrib/netbsd-tests/fs/tmpfs/t_readdir.sh8
-rw-r--r--contrib/netbsd-tests/fs/tmpfs/t_renamerace.c4
3 files changed, 2 insertions, 26 deletions
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh b/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh
index 037dc16..62c7cce 100755
--- a/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh
+++ b/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh
@@ -106,15 +106,7 @@ 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"
@@ -132,15 +124,7 @@ pipe_kqueue_body() {
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
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh b/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
index 272c749..6f5dc3e 100755
--- a/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
+++ b/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh
@@ -59,15 +59,7 @@ types_body() {
atf_check -s eq:0 -o empty -e empty ln -s reg lnk
atf_check -s eq:0 -o empty -e empty mknod blk b 0 0
atf_check -s eq:0 -o empty -e empty mknod chr c 0 0
- # Begin FreeBSD
- if true; then
- atf_check -s eq:0 -o empty -e empty mkfifo fifo
- else
- # End FreeBSD
atf_check -s eq:0 -o empty -e empty mknod fifo p
- # Begin FreeBSD
- fi
- # End FreeBSD
atf_check -s eq:0 -o empty -e empty \
$(atf_get_srcdir)/h_tools sockets sock
diff --git a/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c b/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c
index 044937a..d7c10e4 100644
--- a/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c
+++ b/contrib/netbsd-tests/fs/tmpfs/t_renamerace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_renamerace.c,v 1.13 2011/08/18 21:44:55 riastradh Exp $ */
+/* $NetBSD: t_renamerace.c,v 1.14 2017/01/13 21:30:40 christos Exp $ */
/*
* Modified for rump and atf from a program supplied
@@ -23,7 +23,7 @@
#include <fs/tmpfs/tmpfs_args.h>
-#include "../../h_macros.h"
+#include "h_macros.h"
ATF_TC(renamerace2);
ATF_TC_HEAD(renamerace2, tc)
OpenPOWER on IntegriCloud