Use _SED instead of hacking tests rewriting mknod ... p as mkfifo
Similar to r312297
This commit is contained in:
parent
267f10b14c
commit
183ae521e5
@ -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
|
||||
|
@ -41,6 +41,10 @@ ${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' \
|
||||
|
Loading…
Reference in New Issue
Block a user