Date: Thu, 9 Feb 2017 21:12:26 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r313478 - in stable/10/contrib/netbsd-tests: fs fs/tmpfs kernel/kqueue kernel/kqueue/read Message-ID: <201702092112.v19LCQ5s067598@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Feb 9 21:12:26 2017 New Revision: 313478 URL: https://svnweb.freebsd.org/changeset/base/313478 Log: MFC r305483,r306030,r306031,r306033,r306036: r305483: Fix tests/sys/kqueue NetBSD tests on 32-bit platforms by using proper format specifier for pointers when printing them out with printf(3) Pointyhat to: ngie r306030: Port vnode_leak_test:main to FreeBSD Use a simpler way of dumping kern.maxvnodes, i.e. `sysctl -n kern.maxvnodes` The awk filtering method employed in NetBSD doesn't work on FreeBSD r306031: Port contrib/netbsd-tests/fs/h_funcs.subr to FreeBSD Use kldstat -m to determine whether or not a filesystem is loaded. This works well with tmpfs, ufs, and zfs r306033: Port sizes_test and statvfs_test to FreeBSD Similar to r306030, use a simpler method for getting the value of `hw.pagesize`, i.e. `sysctl -n hw.pagesize`. The awk filtering method doesn't work on FreeBSD r306036: Port to mknod_test and readdir_test to FreeBSD The `mknod <file> p` command doesn't exist on FreeBSD, like on NetBSD. Use mkfifo instead to create named pipes (FIFOs). Modified: stable/10/contrib/netbsd-tests/fs/h_funcs.subr stable/10/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh stable/10/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh stable/10/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh stable/10/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh stable/10/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_file.c stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc1.c stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/netbsd-tests/fs/h_funcs.subr ============================================================================== --- stable/10/contrib/netbsd-tests/fs/h_funcs.subr Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/fs/h_funcs.subr Thu Feb 9 21:12:26 2017 (r313478) @@ -45,6 +45,15 @@ require_fs() { # if we have autoloadable modules, just assume the file system atf_require_prog sysctl + # Begin FreeBSD + if true; then + if kldstat -m ${name}; then + found=yes + else + found=no + fi + else + # End FreeBSD autoload=$(sysctl -n kern.module.autoload) [ "${autoload}" = "1" ] && return 0 @@ -57,6 +66,9 @@ require_fs() { fi shift done + # Begin FreeBSD + fi + # End FreeBSD [ ${found} = yes ] || \ atf_skip "The kernel does not include support the " \ "\`${name}' file system" Modified: stable/10/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh ============================================================================== --- stable/10/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh Thu Feb 9 21:12:26 2017 (r313478) @@ -106,7 +106,15 @@ 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" @@ -124,7 +132,15 @@ 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: stable/10/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh ============================================================================== --- stable/10/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh Thu Feb 9 21:12:26 2017 (r313478) @@ -59,7 +59,15 @@ 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 Modified: stable/10/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh ============================================================================== --- stable/10/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh Thu Feb 9 21:12:26 2017 (r313478) @@ -54,7 +54,15 @@ big_head() { big_body() { test_mount -o -s10M + # Begin FreeBSD + if true; then + pagesize=$(sysctl -n hw.pagesize) + else + # End FreeBSD pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3) + # Begin FreeBSD + fi + # End FreeBSD eval $($(atf_get_srcdir)/h_tools statvfs . | sed -e 's|^f_|cf_|') cf_bused=$((${cf_blocks} - ${cf_bfree})) Modified: stable/10/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh ============================================================================== --- stable/10/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh Thu Feb 9 21:12:26 2017 (r313478) @@ -38,7 +38,15 @@ values_head() { values_body() { test_mount -o -s10M + # Begin FreeBSD + if true; then + pagesize=$(sysctl -n hw.pagesize) + else + # End FreeBSD pagesize=$(sysctl hw.pagesize | cut -d ' ' -f 3) + # Begin FreeBSD + fi + # End FreeBSD eval $($(atf_get_srcdir)/h_tools statvfs .) [ ${pagesize} -eq ${f_bsize} ] || \ atf_fail "Invalid bsize" Modified: stable/10/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh ============================================================================== --- stable/10/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh Thu Feb 9 21:12:26 2017 (r313478) @@ -36,7 +36,15 @@ main_head() { } main_body() { echo "Lowering kern.maxvnodes to 2000" + # Begin FreeBSD + if true; then + sysctl -n kern.maxvnodes > oldvnodes + else + # End FreeBSD sysctl kern.maxvnodes | awk '{ print $3; }' >oldvnodes + # Begin FreeBSD + fi + # End FreeBSD atf_check -s eq:0 -o ignore -e empty sysctl -w kern.maxvnodes=2000 test_mount -o -s$(((4000 + 2) * 4096)) Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c Thu Feb 9 21:12:26 2017 (r313478) @@ -78,7 +78,11 @@ ATF_TC_BODY(fifo, tc) RL(n = kevent(kq, NULL, 0, event, 1, NULL)); (void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, " +#ifdef __FreeBSD__ + "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags, +#else "data: %" PRId64 "\n", n, event[0].filter, event[0].flags, +#endif event[0].fflags, event[0].data); ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ); Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_file.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_file.c Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_file.c Thu Feb 9 21:12:26 2017 (r313478) @@ -111,7 +111,11 @@ ATF_TC_BODY(file, tc) num += n; (void)printf("kevent num %d flags: %#x, fflags: %#x, data: " +#ifdef __FreeBSD__ + "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags, +#else "%" PRId64 "\n", n, event[0].flags, event[0].fflags, +#endif event[0].data); if (event[0].data < 0) Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c Thu Feb 9 21:12:26 2017 (r313478) @@ -67,7 +67,11 @@ ATF_TC_BODY(pipe, tc) RL(n = kevent(kq, NULL, 0, event, 1, NULL)); (void)printf("kevent num %d flags: %#x, fflags: %#x, data: " +#ifdef __FreeBSD__ + "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags, event[0].data); +#else "%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data); +#endif RL(n = read(fds[0], buffer, event[0].data)); buffer[n] = '\0'; Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c Thu Feb 9 21:12:26 2017 (r313478) @@ -103,7 +103,11 @@ h_check(bool check_master) RL(n = kevent(kq, NULL, 0, event, 1, NULL)); (void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, " +#ifdef __FreeBSD__ + "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags, +#else "data: %" PRId64 "\n", n, event[0].filter, event[0].flags, +#endif event[0].fflags, event[0].data); ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ); Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc1.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc1.c Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc1.c Thu Feb 9 21:12:26 2017 (r313478) @@ -138,7 +138,11 @@ ATF_TC_BODY(proc1, tc) printf(" NOTE_FORK"); } if (event[0].fflags & NOTE_CHILD) +#ifdef __FreeBSD__ + printf(" NOTE_CHILD, parent = %" PRIdPTR, event[0].data); +#else printf(" NOTE_CHILD, parent = %" PRId64, event[0].data); +#endif printf("\n"); } Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c Thu Feb 9 19:58:12 2017 (r313477) +++ stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c Thu Feb 9 21:12:26 2017 (r313478) @@ -117,7 +117,11 @@ ATF_TC_BODY(sig, tc) if (n == 0) continue; +#ifdef __FreeBSD__ + (void)printf("sig: kevent flags: 0x%x, data: %" PRIdPTR " (# " +#else (void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# " +#endif "times signal posted)\n", event[0].flags, event[0].data); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702092112.v19LCQ5s067598>