Date: Fri, 10 Feb 2017 01:44:19 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r313501 - in projects/stable-10-backport-test-changes: bin/cat/tests bin/date/tests bin/expr/tests bin/ls/tests bin/mv/tests bin/pax/tests bin/pkill/tests bin/sh/tests bin/sleep/tests b... Message-ID: <201702100144.v1A1iJN5079846@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Feb 10 01:44:18 2017 New Revision: 313501 URL: https://svnweb.freebsd.org/changeset/base/313501 Log: MFstable/10@313500 Added: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh - copied unchanged from r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d - copied unchanged from r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d - copied unchanged from r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d projects/stable-10-backport-test-changes/cddl/usr.sbin/dtrace/tests/ - copied from r313500, stable/10/cddl/usr.sbin/dtrace/tests/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_se_output.in - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/cat/d_se_output.in projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_se_output.out - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/cat/d_se_output.out projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_arith.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_arith.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_cmdsub.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_cmdsub.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_option.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_option.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_redir.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_redir.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_redircloexec.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_redircloexec.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_shift.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_shift.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_varval.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_varval.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/dev/fss/ - copied from r313500, stable/10/contrib/netbsd-tests/dev/fss/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/dev/usb/ - copied from r313500, stable/10/contrib/netbsd-tests/dev/usb/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/include/sys/t_pslist.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/include/sys/t_pslist.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/t_vnode.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/kernel/kqueue/t_vnode.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/db/h_lfsr.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/db/h_lfsr.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/db/t_db_hash_seq.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/db/t_db_hash_seq.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/inet/t_inet_addr.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/inet/t_inet_addr.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/stdio/t_open_memstream.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/stdio/t_open_memstream.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/stdlib/t_strtoi.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/stdlib/t_strtoi.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sync/cpp_atomic_ops_linkable.cc - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/sync/cpp_atomic_ops_linkable.cc projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_bind.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/sys/t_bind.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_getsockname.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/sys/t_getsockname.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_posix_fallocate.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/sys/t_posix_fallocate.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_wait.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libc/sys/t_wait.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libm/t_fenv.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libm/t_fenv.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libm/t_hypot.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/lib/libm/t_hypot.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libusbhid/ - copied from r313500, stable/10/contrib/netbsd-tests/lib/libusbhid/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/arp/ - copied from r313500, stable/10/contrib/netbsd-tests/net/arp/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/icmp/t_icmp6_redirect.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/icmp/t_icmp6_redirect.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/icmp/t_icmp_redirect.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/icmp/t_icmp_redirect.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if/ifconf.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/if/ifconf.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if/t_ifconf.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/if/t_ifconf.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if/t_ifconfig.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/if/t_ifconfig.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if_gif/ - copied from r313500, stable/10/contrib/netbsd-tests/net/if_gif/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if_pppoe/ - copied from r313500, stable/10/contrib/netbsd-tests/net/if_pppoe/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if_tap/ - copied from r313500, stable/10/contrib/netbsd-tests/net/if_tap/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/in_cksum/ - copied from r313500, stable/10/contrib/netbsd-tests/net/in_cksum/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/mcast/ - copied from r313500, stable/10/contrib/netbsd-tests/net/mcast/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/mpls/t_mpls_fw6.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/mpls/t_mpls_fw6.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/mpls/t_mpls_fw64.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/mpls/t_mpls_fw64.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/ndp/ - copied from r313500, stable/10/contrib/netbsd-tests/net/ndp/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/net/t_forwarding.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/net/t_forwarding.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/net/t_ipaddress.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/net/t_ipaddress.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/net/t_ipv6_lifetime.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/net/t_ipv6_lifetime.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/net/t_ipv6address.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/net/t_ipv6address.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/route/t_flags.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/route/t_flags.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/route/t_flags6.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/route/t_flags6.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/route/t_route.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/net/route/t_route.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/gpt/ - copied from r313500, stable/10/contrib/netbsd-tests/sbin/gpt/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/resize_ffs/t_check.sh - copied unchanged from r313500, stable/10/contrib/netbsd-tests/sbin/resize_ffs/t_check.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sys/net/ - copied from r313500, stable/10/contrib/netbsd-tests/sys/net/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/sys/netatalk/ - copied from r313500, stable/10/contrib/netbsd-tests/sys/netatalk/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/sys/netinet/ - copied from r313500, stable/10/contrib/netbsd-tests/sys/netinet/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/sys/netinet6/ - copied from r313500, stable/10/contrib/netbsd-tests/sys/netinet6/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/config/d_min - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/config/d_min projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/gdb/ - copied from r313500, stable/10/contrib/netbsd-tests/usr.bin/gdb/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/ld/ - copied from r313500, stable/10/contrib/netbsd-tests/usr.bin/ld/ projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/netpgpverify/Testspec - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/netpgpverify/Testspec projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_anon_struct.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_anon_struct.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_compound_literal_comma.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_compound_literal_comma.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_flex_array_packed.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_flex_array_packed.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_nested_struct.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_nested_struct.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init4.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init4.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_question_colon.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_question_colon.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typefun.c - copied unchanged from r313500, stable/10/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typefun.c projects/stable-10-backport-test-changes/lib/libc/tests/stdio/open_memstream2_test.c - copied unchanged from r313500, stable/10/lib/libc/tests/stdio/open_memstream2_test.c projects/stable-10-backport-test-changes/lib/libpam/libpam/tests/ - copied from r313500, stable/10/lib/libpam/libpam/tests/ Deleted: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_compexit.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/nfs/nfsservice/mountd.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/nfs/nfsservice/nfsd.c projects/stable-10-backport-test-changes/lib/libc/tests/stdio/open_memstream_test.c Modified: projects/stable-10-backport-test-changes/bin/cat/tests/Makefile projects/stable-10-backport-test-changes/bin/date/tests/Makefile projects/stable-10-backport-test-changes/bin/expr/tests/Makefile projects/stable-10-backport-test-changes/bin/ls/tests/Makefile projects/stable-10-backport-test-changes/bin/mv/tests/Makefile projects/stable-10-backport-test-changes/bin/pax/tests/Makefile projects/stable-10-backport-test-changes/bin/pkill/tests/Makefile projects/stable-10-backport-test-changes/bin/sh/tests/Makefile projects/stable-10-backport-test-changes/bin/sleep/tests/Makefile projects/stable-10-backport-test-changes/bin/test/tests/Makefile projects/stable-10-backport-test-changes/bin/tests/Makefile projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c projects/stable-10-backport-test-changes/cddl/lib/tests/Makefile projects/stable-10-backport-test-changes/cddl/sbin/tests/Makefile projects/stable-10-backport-test-changes/cddl/tests/Makefile projects/stable-10-backport-test-changes/cddl/usr.bin/tests/Makefile projects/stable-10-backport-test-changes/cddl/usr.sbin/tests/Makefile projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.in projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.out projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/t_cat.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_evaltested.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_exit.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_expand.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_fsplit.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_here.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_set_e.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_ulimit.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_varquote.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_wait.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/crypto/opencrypto/t_opencrypto.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/dev/audio/t_pad_output.bz2.uue projects/stable-10-backport-test-changes/contrib/netbsd-tests/dev/dm/h_dm.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/dev/sysmon/t_swwdog.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/common/fstest_lfs.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/common/h_fsmacros.h projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/h_funcs.subr projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/nfs/nfsservice/rumpnfsd.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/nfs/t_rquotad.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/tmpfs/t_mknod.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/tmpfs/t_readdir.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/tmpfs/t_sizes.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/tmpfs/t_statvfs.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/tmpfs/t_vnode_leak.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/vfs/t_io.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/vfs/t_renamerace.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/vfs/t_unpriv.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/fs/vfs/t_vnops.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/games/t_factor.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/h_macros.h projects/stable-10-backport-test-changes/contrib/netbsd-tests/include/sys/t_bitops.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/include/sys/t_cdefs.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/include/sys/t_socket.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/include/t_paths.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/ipf/expected/n14 projects/stable-10-backport-test-changes/contrib/netbsd-tests/ipf/expected/n14_6 projects/stable-10-backport-test-changes/contrib/netbsd-tests/ipf/t_filter_parse.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/ipf/t_nat_exec.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/read/t_file.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/t_ioctl.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/t_proc1.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/t_proc2.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/t_proc3.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/kqueue/t_sig.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/kernel/t_rnd.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libbpfjit/t_bpfjit.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/arch/ia64/return_one.S projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/arch/powerpc/return_one.S projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/arch/riscv/return_one.S projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/db/t_db.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/execve/t_execve.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/isqemu.h projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_fnmatch.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_nice.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_randomid.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_sleep.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/gen/t_vis.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/net/t_servent.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/string/t_memset.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_connect.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_mlock.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_mmap.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libcurses/director/testlang_parse.y projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libm/t_exp.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libm/t_fmod.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libm/t_log.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libm/t_pow.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libpthread/t_cond.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libpthread/t_rwlock.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/librumpclient/t_exec.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/librumpclient/t_fd.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/librumphijack/t_tcpip.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/lib/libutil/t_parsedate.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/bpfilter/t_bpfilter.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/icmp/t_forward.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/icmp/t_ping.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/icmp/t_ping2.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/if_bridge/t_bridge.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/mpls/t_ldp_regen.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/mpls/t_mpls_fw.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/mpls/t_rfc4182.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/net/t_tcp.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/net/route/t_change.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/rump/modautoload/t_modautoload.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/rump/rumpkern/t_sp.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/resize_ffs/common.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/resize_ffs/t_grow.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/resize_ffs/t_grow_swapped.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/resize_ffs/t_shrink.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/resize_ffs/t_shrink_swapped.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/sbin/sysctl/t_perm.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/share/mk/t_lib.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/share/mk/t_prog.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/share/mk/t_test.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/cc/t_hello.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/config/support/conf/files projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/config/t_config.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/make/t_make.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/netpgpverify/t_netpgpverify.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/sed/t_sed.sh projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/sort/d_any_char_dflag_out.txt (contents, props changed) projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/sort/d_any_char_fflag_out.txt (contents, props changed) projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.bin/sort/d_any_char_iflag_out.txt (contents, props changed) projects/stable-10-backport-test-changes/contrib/netbsd-tests/usr.sbin/traceroute/t_traceroute.sh projects/stable-10-backport-test-changes/etc/mtree/BSD.tests.dist projects/stable-10-backport-test-changes/gnu/lib/tests/Makefile projects/stable-10-backport-test-changes/gnu/tests/Makefile projects/stable-10-backport-test-changes/gnu/usr.bin/diff/tests/Makefile projects/stable-10-backport-test-changes/gnu/usr.bin/tests/Makefile projects/stable-10-backport-test-changes/lib/atf/libatf-c++/tests/Makefile projects/stable-10-backport-test-changes/lib/atf/libatf-c++/tests/detail/Makefile projects/stable-10-backport-test-changes/lib/atf/libatf-c/tests/Makefile projects/stable-10-backport-test-changes/lib/atf/libatf-c/tests/detail/Makefile projects/stable-10-backport-test-changes/lib/atf/tests/Makefile projects/stable-10-backport-test-changes/lib/atf/tests/test-programs/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/Makefile.netbsd-tests projects/stable-10-backport-test-changes/lib/libc/tests/c063/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/db/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/gen/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/gen/execve/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/gen/posix_spawn/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/hash/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/inet/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/locale/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/net/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/net/getaddrinfo/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/regex/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/rpc/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/setjmp/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/ssp/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/stdio/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/stdlib/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/string/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/sys/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/termios/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/time/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/tls/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/tls/dso/Makefile projects/stable-10-backport-test-changes/lib/libc/tests/ttyio/Makefile projects/stable-10-backport-test-changes/lib/libcrypt/tests/Makefile projects/stable-10-backport-test-changes/lib/libmp/tests/Makefile projects/stable-10-backport-test-changes/lib/libnv/tests/Makefile projects/stable-10-backport-test-changes/lib/libpam/libpam/Makefile projects/stable-10-backport-test-changes/lib/librt/tests/Makefile projects/stable-10-backport-test-changes/lib/libthr/tests/Makefile projects/stable-10-backport-test-changes/lib/libthr/tests/dlopen/Makefile projects/stable-10-backport-test-changes/lib/libthr/tests/dlopen/dso/Makefile projects/stable-10-backport-test-changes/lib/libutil/tests/Makefile projects/stable-10-backport-test-changes/lib/msun/tests/Makefile projects/stable-10-backport-test-changes/lib/tests/Makefile projects/stable-10-backport-test-changes/libexec/atf/atf-check/tests/Makefile projects/stable-10-backport-test-changes/libexec/atf/atf-sh/tests/Makefile projects/stable-10-backport-test-changes/libexec/atf/tests/Makefile projects/stable-10-backport-test-changes/libexec/tests/Makefile projects/stable-10-backport-test-changes/sbin/devd/tests/Makefile projects/stable-10-backport-test-changes/sbin/dhclient/tests/Makefile projects/stable-10-backport-test-changes/sbin/growfs/tests/Makefile projects/stable-10-backport-test-changes/sbin/mdconfig/tests/Makefile projects/stable-10-backport-test-changes/sbin/tests/Makefile projects/stable-10-backport-test-changes/secure/lib/tests/Makefile projects/stable-10-backport-test-changes/secure/libexec/tests/Makefile projects/stable-10-backport-test-changes/secure/tests/Makefile projects/stable-10-backport-test-changes/secure/usr.bin/tests/Makefile projects/stable-10-backport-test-changes/secure/usr.sbin/tests/Makefile projects/stable-10-backport-test-changes/share/examples/tests/Makefile projects/stable-10-backport-test-changes/share/tests/Makefile projects/stable-10-backport-test-changes/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/stable-10-backport-test-changes/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h projects/stable-10-backport-test-changes/tests/etc/Makefile projects/stable-10-backport-test-changes/tests/sys/mqueue/Makefile projects/stable-10-backport-test-changes/tests/sys/pjdfstest/tests/Makefile projects/stable-10-backport-test-changes/tools/test/dtrace/Makefile projects/stable-10-backport-test-changes/usr.bin/apply/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/basename/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/calendar/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/cmp/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/col/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/comm/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/cut/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/dirname/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/file2c/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/grep/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/gzip/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/join/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/jot/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/lastcomm/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/m4/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/ncal/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/printf/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/sed/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/truncate/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/uudecode/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/uuencode/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/xargs/tests/Makefile projects/stable-10-backport-test-changes/usr.bin/yacc/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/etcupdate/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/fstyp/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/newsyslog/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/nmtree/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/pw/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/sa/tests/Makefile projects/stable-10-backport-test-changes/usr.sbin/tests/Makefile Directory Properties: projects/stable-10-backport-test-changes/ (props changed) Modified: projects/stable-10-backport-test-changes/bin/cat/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/cat/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/cat/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -1,18 +1,20 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/bin/cat - -TESTSDIR= ${TESTSBASE}/bin/cat - NETBSD_ATF_TESTS_SH= cat_test FILESDIR= ${TESTSDIR} -FILES= d_align.in +FILES+= d_align.in FILES+= d_align.out +FILES+= d_se_output.in +FILES+= d_se_output.out .include <netbsd-tests.test.mk> +d_align.out: ${TESTSRC}/d_align.out + sed -E -e 's,^[[:space:]]{7}\$$$$,\$$,' < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= d_align.out d_align.out.tmp + .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/bin/date/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/date/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/date/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/date - ATF_TESTS_SH= format_string_test .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/bin/expr/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/expr/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/expr/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -1,11 +1,5 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/bin/expr - -TESTSDIR= ${TESTSBASE}/bin/expr - NETBSD_ATF_TESTS_SH= expr_test ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g' Modified: projects/stable-10-backport-test-changes/bin/ls/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/ls/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/ls/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/bin/ls - ATF_TESTS_SH+= ls_tests # This seems like overkill, but the idea in mind is that all of the testcases # should be runnable as !root Modified: projects/stable-10-backport-test-changes/bin/mv/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/mv/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/mv/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/mv - TAP_TESTS_SH= legacy_test .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/bin/pax/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/pax/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/pax/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/pax - TAP_TESTS_PERL= legacy_test .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/bin/pkill/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/pkill/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/pkill/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/pkill - TAP_TESTS_SH= pgrep-F_test TAP_TESTS_SH+= pgrep-LF_test TAP_TESTS_SH+= pgrep-P_test Modified: projects/stable-10-backport-test-changes/bin/sh/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/sh/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/sh/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/sh - TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution Modified: projects/stable-10-backport-test-changes/bin/sleep/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/sleep/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/sleep/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -1,12 +1,7 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/bin/sleep -.PATH: ${TESTSRC} - .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/sleep -ATF_TESTS_SH= sleep_test -ATF_TESTS_SH_SRC_sleep_test= t_sleep.sh +NETBSD_ATF_TESTS_SH= sleep_test .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/bin/test/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/test/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/test/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/test - TAP_TESTS_SH= legacy_test # Some tests in here are silently not run when the tests are executed as # root. Explicitly tell Kyua to drop privileges. Modified: projects/stable-10-backport-test-changes/bin/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/bin/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/bin/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Fri Feb 10 01:44:18 2017 (r313501) @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/ioctl.h> + #include <assert.h> #include <setjmp.h> #include <signal.h> @@ -69,7 +71,7 @@ main(int argc, char *argv[]) */ if (sigsetjmp(env, 1) == 0) { for (;;) - (void) ioctl(-1, -1, NULL); + (void) ioctl(-1, 0, NULL); } /* @@ -80,20 +82,19 @@ main(int argc, char *argv[]) fds[n++] = open(file, O_WRONLY); fds[n++] = open(file, O_RDWR); - fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC | - O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC | - O_SYNC | O_TRUNC | O_XATTR, 0666); + fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | + O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666); fds[n++] = open(file, O_RDWR); (void) lseek(fds[n - 1], 123, SEEK_SET); /* * Once we have all the file descriptors in the state we want to test, - * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack + * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack * our DTrace script into recording the content of the fds[] array. */ for (i = 0; i < n; i++) - (void) ioctl(fds[i], -1, NULL); + (void) ioctl(fds[i], 0, NULL); assert(n <= sizeof (fds) / sizeof (fds[0])); exit(0); Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Fri Feb 10 01:44:18 2017 (r313501) @@ -36,7 +36,7 @@ syscall::ioctl:entry } syscall::ioctl:entry -/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/ +/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/ { printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name); printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname); Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c Fri Feb 10 01:44:18 2017 (r313501) @@ -14,6 +14,8 @@ */ #include <sys/sdt.h> +#include <stdio.h> +#include <stdlib.h> #include "usdt.h" #define FMT "{" \ Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c Fri Feb 10 01:44:18 2017 (r313501) @@ -28,6 +28,7 @@ #include <strings.h> #include <rpc/rpc.h> +#include <stdio.h> #include <stdlib.h> #include <sys/param.h> #include <rpcsvc/mount.h> Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Fri Feb 10 01:44:18 2017 (r313501) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> int Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c Fri Feb 10 01:44:18 2017 (r313501) @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/types.h> +#include <sys/wait.h> #include <spawn.h> #include <signal.h> #include <stdio.h> Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c Fri Feb 10 01:44:18 2017 (r313501) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c Fri Feb 10 01:44:18 2017 (r313501) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c Fri Feb 10 01:44:18 2017 (r313501) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Fri Feb 10 01:44:18 2017 (r313501) @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <signal.h> +#include <stdlib.h> #include <unistd.h> /* @@ -34,14 +35,14 @@ * leading underscores. */ -#pragma weak _go = go - static int go(int a) { return (a + 1); } +#pragma weak _go = go + static void handle(int sig) { Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d Fri Feb 10 01:44:18 2017 (r313501) @@ -44,7 +44,7 @@ BEGIN printf("\n"); - printf("%%a = %a\n", &`kmem_alloc); + printf("%%a = %a\n", &`malloc); printf("%%c = %c\n", i); printf("%%d = %d\n", i); printf("%%hd = %hd\n", (short)i); Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out Fri Feb 10 01:44:18 2017 (r313501) @@ -1,5 +1,5 @@ -%a = genunix`kmem_alloc +%a = kernel`malloc %c = a %d = 97 %hd = 97 Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d Fri Feb 10 01:44:18 2017 (r313501) @@ -36,6 +36,6 @@ BEGIN { - printf("sysname = %s", `utsname.sysname); + printf("sysname = %s", `ostype); exit(0); } Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out Fri Feb 10 01:44:18 2017 (r313501) @@ -1 +1 @@ -sysname = SunOS +sysname = FreeBSD Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d Fri Feb 10 01:44:18 2017 (r313501) @@ -38,6 +38,6 @@ BEGIN { - printf("symbol = %a", &`kmem_alloc); + printf("symbol = %a", &`malloc); exit(0); } Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out Fri Feb 10 01:44:18 2017 (r313501) @@ -1 +1 @@ -symbol = kernel`kmem_alloc +symbol = kernel`malloc Copied: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh (from r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh Fri Feb 10 01:44:18 2017 (r313501, copy of r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh) @@ -0,0 +1,112 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright (c) 2015, Joyent, Inc. All rights reserved. +# + +err=/tmp/err.$$ + +ppriv -s A=basic,dtrace_user $$ + +# +# When we lack dtrace_kernel, we expect to not be able to get at kernel memory +# via any subroutine or other vector. +# +# trace(func((void *)&\`utsname)); } +/usr/sbin/dtrace -wq -Cs /dev/stdin 2> $err <<EOF + +#define FAIL \ + printf("able to read kernel memory via %s!\n", badsubr); \ + exit(2); + +#define CANTREAD1(func) \ + BEGIN { badsubr = "func()"; func((void *)&\`utsname); FAIL } + +#define CANTREAD2(func, arg1) \ + BEGIN { badsubr = "func()"; func((void *)&\`utsname, arg1); FAIL } + +#define CANTREAD2ARG1(func, arg0) \ + BEGIN { badsubr = "func() (arg1)"; func(arg0, (void *)&\`utsname); FAIL } + +#define CANTREAD3(func, arg1, arg2) \ + BEGIN { badsubr = "func()"; func((void *)&\`utsname, arg1, arg2); FAIL } + +CANTREAD1(mutex_owned) +CANTREAD1(mutex_owner) +CANTREAD1(mutex_type_adaptive) +CANTREAD1(mutex_type_spin) +CANTREAD1(rw_read_held) +CANTREAD1(rw_write_held) +CANTREAD1(rw_iswriter) +CANTREAD3(bcopy, alloca(1), 1) +CANTREAD1(msgsize) +CANTREAD1(msgdsize) +CANTREAD1(strlen) +CANTREAD2(strchr, '!') +CANTREAD2(strrchr, '!') +CANTREAD2(strstr, "doogle") +CANTREAD2ARG1(strstr, "doogle") +CANTREAD2(index, "bagnoogle") +CANTREAD2ARG1(index, "bagnoogle") +CANTREAD2(rindex, "bagnoogle") +CANTREAD2ARG1(rindex, "bagnoogle") +CANTREAD2(strtok, "doogle") +CANTREAD2ARG1(strtok, "doogle") +CANTREAD2(json, "doogle") +CANTREAD2ARG1(json, "doogle") +CANTREAD1(toupper) +CANTREAD1(tolower) +CANTREAD2(ddi_pathname, 1) +CANTREAD2(strjoin, "doogle") +CANTREAD2ARG1(strjoin, "doogle") +CANTREAD1(strtoll) +CANTREAD1(dirname) +CANTREAD1(basename) +CANTREAD1(cleanpath) + +#if defined(__amd64) +CANTREAD3(copyout, uregs[R_R9], 1) +CANTREAD3(copyoutstr, uregs[R_R9], 1) +#else +#if defined(__i386) +CANTREAD3(copyout, uregs[R_ESP], 1) +CANTREAD3(copyoutstr, uregs[R_ESP], 1) +#endif +#endif + +BEGIN +{ + exit(0); +} + +ERROR +/arg4 != DTRACEFLT_KPRIV/ +{ + printf("bad error code via %s (expected %d, found %d)\n", + badsubr, DTRACEFLT_KPRIV, arg4); + exit(3); +} + +ERROR +/arg4 == DTRACEFLT_KPRIV/ +{ + printf("illegal kernel access properly prevented from %s\n", badsubr); +} +EOF + +status=$? + +if [[ $status -eq 1 ]]; then + cat $err +fi + +exit $status Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh Fri Feb 10 01:44:18 2017 (r313501) @@ -64,7 +64,7 @@ child=$! # ksh doing work. (This actually goes one step further and assumes that we # catch some non-static function in ksh.) # -script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null +script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null status=$? kill $child Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh Fri Feb 10 01:44:18 2017 (r313501) @@ -62,7 +62,7 @@ child=$! # # The only thing we can be sure of here is that ksh is doing some work. # -script | tee /dev/fd/2 | grep -w ksh > /dev/null +script | tee /dev/fd/2 | egrep -w 'ksh(93)?' > /dev/null status=$? kill $child Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh Fri Feb 10 01:44:18 2017 (r313501) @@ -63,7 +63,7 @@ child=$! # This test is essentially the same as that in the ufunc test; see that # test for the rationale. # -script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null +script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null status=$? kill $child Copied: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d (from r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d Fri Feb 10 01:44:18 2017 (r313501, copy of r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d) @@ -0,0 +1,26 @@ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + */ + +/* + * Copyright (c) 2015, Joyent, Inc. All rights reserved. + */ + +struct mrbig { + char toomany[100000]; +}; + +struct mrbig mrbig; + +BEGIN +{ + mrbig.toomany[0] = '!'; + exit(0); +} Copied: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d (from r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d Fri Feb 10 01:44:18 2017 (r313501, copy of r313500, stable/10/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d) @@ -0,0 +1,26 @@ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms of version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + */ + +/* + * Copyright (c) 2015, Joyent, Inc. All rights reserved. + */ + +struct mrbig { + char toomany[100000]; +}; + +this struct mrbig mrbig; + +BEGIN +{ + this->mrbig.toomany[0] = '!'; + exit(0); +} Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c Fri Feb 10 01:44:18 2017 (r313501) @@ -28,6 +28,7 @@ #include <stdio.h> #include <sys/syscall.h> +#include <unistd.h> /*ARGSUSED*/ int Modified: projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c ============================================================================== --- projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c Fri Feb 10 01:44:18 2017 (r313501) @@ -26,6 +26,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" +#include <sys/types.h> +#include <sys/wait.h> + +#include <stdlib.h> #include <unistd.h> #include "forker.h" Modified: projects/stable-10-backport-test-changes/cddl/lib/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/cddl/lib/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/lib/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/cddl/lib - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/cddl/sbin/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/cddl/sbin/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/sbin/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/cddl/sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/cddl/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/cddl/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/cddl - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/cddl/usr.bin/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/cddl/usr.bin/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/usr.bin/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/cddl/usr.bin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/cddl/usr.sbin/tests/Makefile ============================================================================== --- projects/stable-10-backport-test-changes/cddl/usr.sbin/tests/Makefile Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/cddl/usr.sbin/tests/Makefile Fri Feb 10 01:44:18 2017 (r313501) @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/cddl/usr.sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.in ============================================================================== --- projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.in Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.in Fri Feb 10 01:44:18 2017 (r313501) @@ -1,3 +1,5 @@ a b c + 1 2 3 + x y z Modified: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.out ============================================================================== --- projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.out Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_align.out Fri Feb 10 01:44:18 2017 (r313501) @@ -1,3 +1,5 @@ 1 a b c$ + $ 2 1 2 3$ + $ 3 x y z$ Copied: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_se_output.in (from r313500, stable/10/contrib/netbsd-tests/bin/cat/d_se_output.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_se_output.in Fri Feb 10 01:44:18 2017 (r313501, copy of r313500, stable/10/contrib/netbsd-tests/bin/cat/d_se_output.in) @@ -0,0 +1,3 @@ + +Of course it runs NetBSD + Copied: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_se_output.out (from r313500, stable/10/contrib/netbsd-tests/bin/cat/d_se_output.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/d_se_output.out Fri Feb 10 01:44:18 2017 (r313501, copy of r313500, stable/10/contrib/netbsd-tests/bin/cat/d_se_output.out) @@ -0,0 +1,3 @@ +$ +Of course it runs NetBSD$ +$ Modified: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/t_cat.sh ============================================================================== --- projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/t_cat.sh Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/cat/t_cat.sh Fri Feb 10 01:44:18 2017 (r313501) @@ -1,4 +1,4 @@ -# $NetBSD: t_cat.sh,v 1.2 2012/03/27 17:57:02 jruoho Exp $ +# $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $ # # Copyright (c) 2012 The NetBSD Foundation, Inc. # All rights reserved. @@ -52,8 +52,20 @@ nonexistent_body() { -x "cat /some/name/that/does/not/exist" } +atf_test_case se_output +se_output_head() { + atf_set "descr" "Test that cat(1) prints a $ sign " \ + "on blank lines with options '-se' (PR bin/51250)" +} + +se_output_body() { + atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \ + -x "cat -se $(atf_get_srcdir)/d_se_output.in" +} + atf_init_test_cases() { atf_add_test_case align atf_add_test_case nonexistent + atf_add_test_case se_output } Modified: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command ============================================================================== --- projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command Fri Feb 10 01:44:18 2017 (r313501) @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: scoped_command,v 1.1 2014/05/31 14:29:06 christos Exp $ +# $NetBSD: scoped_command,v 1.2 2016/03/27 14:57:50 christos Exp $ # # Copyright (c) 2014 The NetBSD Foundation, Inc. # All rights reserved. @@ -30,6 +30,27 @@ # POSSIBILITY OF SUCH DAMAGE. # +: ${TEST_SH:=/bin/sh} + +sane_sh() +{ + set -- ${TEST_SH} + case "$#" in + (0) set /bin/sh;; + (1|2) ;; + (*) set "$1";; # Just ignore options if we cannot make them work + esac + + case "$1" in + /*) TEST_SH="$1${2+ }$2";; + ./*) TEST_SH="${PWD}${1#.}${2+ }$2";; + */*) TEST_SH="${PWD}/$1${2+ }$2";; + *) TEST_SH="$( command -v "$1" )${2+ }$2";; + esac +} + +sane_sh + set -e # USAGE: @@ -52,7 +73,7 @@ cmd="echo 'before ${3}' ${2} echo 'after ${3}, return value:' ${?}" -echo "#!/bin/sh" +echo "#!${TEST_SH}" [ 'func' = "${1}" ] && cat <<EOF func() Modified: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh ============================================================================== --- projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh Fri Feb 10 01:26:49 2017 (r313500) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh Fri Feb 10 01:44:18 2017 (r313501) @@ -1,4 +1,4 @@ -# $NetBSD: t_dotcmd.sh,v 1.1 2014/05/31 14:29:06 christos Exp $ +# $NetBSD: t_dotcmd.sh,v 1.2 2016/03/27 14:57:50 christos Exp $ # # Copyright (c) 2014 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,6 +33,10 @@ # in C/C++ so, for example, if the dotcmd is in a loop's body, a break in # the sourced file can be used to break out of that loop. +# Note that the standard does not require this, and allows lexically +# scoped interpretation of break/continue (and permits dynamic scope +# as an optional extension.) + cmds='return break continue' scopes='case compound file for func subshell until while' Copied: projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_arith.sh (from r313500, stable/10/contrib/netbsd-tests/bin/sh/t_arith.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stable-10-backport-test-changes/contrib/netbsd-tests/bin/sh/t_arith.sh Fri Feb 10 01:44:18 2017 (r313501, copy of r313500, stable/10/contrib/netbsd-tests/bin/sh/t_arith.sh) @@ -0,0 +1,1035 @@ +# $NetBSD: t_arith.sh,v 1.5 2016/05/12 14:25:11 kre Exp $ +# +# Copyright (c) 2016 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. +# +# the implementation of "sh" to test +: ${TEST_SH:="/bin/sh"} + +# Requirement is to support at least "signed long" whatever that means +# (number of bits in "long" is not specified - but should be at least 32). + +# These tests use -o inline:"..." rather than -o match:'...' as we have +# only digits to examine, and it is good to be sure that 1 + 1 really gives 2 +# and that 42 or 123 don't look like success because there is a 2 in them. + +ARITH_BITS='?' +discover_range() +{ + # cannot use arithmetic "test" operators, range of test in + # ATF_SHELL (or even TEST_SH) might not be as big as that + # supported by $(( )) in TEST_SH + + if ! ${TEST_SH} -c ': $(( 0x10000 ))' 2>/dev/null + then + # 16 bits or less, or hex unsupported, just give up... + return + fi + test $( ${TEST_SH} -c 'echo $(( 0x1FFFF ))' ) = 131071 || return + + # when attempting to exceed the number of available bits + # the shell may react in any of 3 (rational) ways + # 1. syntax error (maybe even core dump...) and fail + # 2. represent a positive number input as negative value + # 3. keep the number positive, but not the value expected + # (perhaps pegged at the max possible value) + # any of those may be accompanied by a message to stderr + + # Must check all 3 possibilities for each plausible size + # Tests do not use 0x8000... because that value can have weird + # other side effects that are not relevant to discover here. + # But we do want to try and force the sign bit set. + + if ! ${TEST_SH} -c ': $(( 0xC0000000 ))' 2>/dev/null + then + # proobably shell detected overflow and complained + ARITH_BITS=32 + return + fi + if ${TEST_SH} 2>/dev/null \ + -c 'case $(( 0xC0000000 )); in (-*) exit 0;; esac; exit 1' + then + ARITH_BITS=32 + return + fi + if ${TEST_SH} -c '[ $(( 0xC0000000 )) != 3221225472 ]' 2>/dev/null + then + ARITH_BITS=32 + return + fi + + if ! ${TEST_SH} -c ': $(( 0xC000000000000000 ))' 2>/dev/null + then + ARITH_BITS=64 + return + fi + if ${TEST_SH} 2>/dev/null \ + -c 'case $(( 0xC000000000000000 )); in (-*) exit 0;; esac; exit 1' + then + ARITH_BITS=64 + return + fi + if ${TEST_SH} 2>/dev/null \ + -c '[ $((0xC000000000000000)) != 13835058055282163712 ]' + then + ARITH_BITS=64 + return + fi + + if ${TEST_SH} 2>/dev/null -c \ + '[ $((0x123456781234567812345678)) = 5634002657842756053938493048 ]' + then + # just assume... (for now anyway, revisit when it happens...) + ARITH_BITS=96 + return + fi +} + +atf_test_case constants +constants_head() +{ + atf_set "descr" "Tests that arithmetic expansion can handle constants" +} +constants_body() +{ + atf_check -s exit:0 -o inline:'1\n' -e empty ${TEST_SH} -c \ + 'echo $(( 1 ))' + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $(( 0 ))' + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $((0x0))' + + # atf_expect_fail "PR bin/50959" + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $((0X0))' + # atf_expect_pass + + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $((000))' + + atf_check -s exit:0 -o inline:'1\n' -e empty \ + ${TEST_SH} -c 'echo $(( 000000001 ))' + atf_check -s exit:0 -o inline:'0\n' -e empty \ + ${TEST_SH} -c 'echo $(( 0x000000 ))' + + atf_check -s exit:0 -o inline:'99999\n' -e empty \ + ${TEST_SH} -c 'echo $((99999))' + + [ ${ARITH_BITS} -gt 44 ] && + atf_check -s exit:0 -o inline:'9191919191919\n' -e empty \ + ${TEST_SH} -c 'echo $((9191919191919))' + + atf_check -s exit:0 -o inline:'13\n' -e empty ${TEST_SH} -c \ + 'echo $(( 0xD ))' + atf_check -s exit:0 -o inline:'11\n' -e empty ${TEST_SH} -c \ + 'echo $(( 013 ))' + atf_check -s exit:0 -o inline:'7\n' -e empty ${TEST_SH} -c \ + 'x=7;echo $(($x))' + atf_check -s exit:0 -o inline:'9\n' -e empty ${TEST_SH} -c \ + 'x=9;echo $((x))' + + atf_check -s exit:0 -o inline:'11\n' -e empty \ + ${TEST_SH} -c 'x=0xB; echo $(( $x ))' + atf_check -s exit:0 -o inline:'27\n' -e empty \ + ${TEST_SH} -c 'x=0X1B; echo $(( x ))' + atf_check -s exit:0 -o inline:'27\n' -e empty \ + ${TEST_SH} -c 'X=033; echo $(( $X ))' + atf_check -s exit:0 -o inline:'219\n' -e empty \ + ${TEST_SH} -c 'X=0333; echo $(( X ))' + atf_check -s exit:0 -o inline:'0\n' -e empty \ + ${TEST_SH} -c 'NULL=; echo $(( NULL ))' + + # Not clear if this is 0, nothing, or an error, so omit for now + # atf_check -s exit:0 -o inline:'0\n' -e empty \ + # ${TEST_SH} -c 'echo $(( ))' + + # not clear whether this should return 0 or an error, so omit for now + # atf_check -s exit:0 -o inline:'0\n' -e empty \ + # ${TEST_SH} -c 'echo $(( UNDEFINED_VAR ))' +} + + +atf_test_case do_unary_plus +do_unary_plus_head() +{ + atf_set "descr" "Tests that unary plus works as expected" +} +do_unary_plus_body() +{ + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $(( +0 ))' + atf_check -s exit:0 -o inline:'1\n' -e empty ${TEST_SH} -c \ + 'echo $(( +1 ))' + atf_check -s exit:0 -o inline:'6\n' -e empty ${TEST_SH} -c \ + 'echo $(( + 6 ))' + atf_check -s exit:0 -o inline:'4321\n' -e empty ${TEST_SH} -c \ + 'echo $(( + 4321 ))' + atf_check -s exit:0 -o inline:'17185\n' -e empty ${TEST_SH} -c \ + 'echo $(( + 0x4321 ))' +} + +atf_test_case do_unary_minus +do_unary_minus_head() +{ + atf_set "descr" "Tests that unary minus works as expected" +} +do_unary_minus_body() +{ + atf_check -s exit:0 -o inline:'-1\n' -e empty ${TEST_SH} -c \ + 'echo $(( -1 ))' + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $(( - 0 ))' + atf_check -s exit:0 -o inline:'-1\n' -e empty ${TEST_SH} -c \ + 'echo $(( - 1 ))' + atf_check -s exit:0 -o inline:'-6\n' -e empty ${TEST_SH} -c \ + 'echo $(( - 6 ))' + atf_check -s exit:0 -o inline:'-4321\n' -e empty ${TEST_SH} -c \ + 'echo $(( - 4321 ))' + atf_check -s exit:0 -o inline:'-2257\n' -e empty ${TEST_SH} -c \ + 'echo $(( - 04321 ))' + atf_check -s exit:0 -o inline:'-7\n' -e empty ${TEST_SH} -c \ + 'echo $((-7))' +} + +atf_test_case do_unary_not +do_unary_not_head() +{ + atf_set "descr" "Tests that unary not (boolean) works as expected" +} +do_unary_not_body() +{ + atf_check -s exit:0 -o inline:'0\n' -e empty ${TEST_SH} -c \ + 'echo $(( ! 1 ))' + atf_check -s exit:0 -o inline:'1\n' -e empty ${TEST_SH} -c \ + 'echo $(( ! 0 ))' + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702100144.v1A1iJN5079846>