Date: Mon, 16 Jan 2017 17:53:58 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312298 - in projects/netbsd-tests-upstream-01-2017: contrib/netbsd-tests/fs/tmpfs tests/sys/fs/tmpfs Message-ID: <201701161753.v0GHrwi5075379@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Jan 16 17:53:58 2017 New Revision: 312298 URL: https://svnweb.freebsd.org/changeset/base/312298 Log: Use _SED instead of hacking tests rewriting mknod ... p as mkfifo Similar to r312297 Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile Modified: 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 Mon Jan 16 17:49:53 2017 (r312297) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh Mon Jan 16 17:53:58 2017 (r312298) @@ -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 Modified: projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile ============================================================================== --- projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile Mon Jan 16 17:49:53 2017 (r312297) +++ projects/netbsd-tests-upstream-01-2017/tests/sys/fs/tmpfs/Makefile Mon Jan 16 17:53:58 2017 (r312298) @@ -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' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701161753.v0GHrwi5075379>