Date: Fri, 2 Oct 2015 05:30:47 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r288474 - in user/ngie/more-tests: . bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars cddl/contrib/opensolari... Message-ID: <201510020530.t925UljI007325@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Oct 2 05:30:46 2015 New Revision: 288474 URL: https://svnweb.freebsd.org/changeset/base/288474 Log: MFhead @ r288473 Added: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh - copied unchanged from r288473, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d - copied unchanged from r288473, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d - copied unchanged from r288473, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d user/ngie/more-tests/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in - copied unchanged from r288473, head/gnu/usr.bin/groff/tmac/fr.ISO8859-1.in user/ngie/more-tests/gnu/usr.bin/groff/tmac/mdoc.local.in - copied unchanged from r288473, head/gnu/usr.bin/groff/tmac/mdoc.local.in user/ngie/more-tests/gnu/usr.bin/groff/tmac/ru.KOI8-R.in - copied unchanged from r288473, head/gnu/usr.bin/groff/tmac/ru.KOI8-R.in user/ngie/more-tests/release/arm/BANANAPI.conf - copied unchanged from r288473, head/release/arm/BANANAPI.conf user/ngie/more-tests/release/arm/CUBIEBOARD.conf - copied unchanged from r288473, head/release/arm/CUBIEBOARD.conf user/ngie/more-tests/release/arm/CUBIEBOARD2.conf - copied unchanged from r288473, head/release/arm/CUBIEBOARD2.conf user/ngie/more-tests/usr.sbin/Makefile.arm64 - copied unchanged from r288473, head/usr.sbin/Makefile.arm64 Deleted: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/sgs/ user/ngie/more-tests/cddl/contrib/opensolaris/common/avl/avl.c user/ngie/more-tests/cddl/usr.bin/sgsmsg/ user/ngie/more-tests/gnu/usr.bin/groff/tmac/fr.ISO8859-1 user/ngie/more-tests/gnu/usr.bin/groff/tmac/mdoc.local user/ngie/more-tests/gnu/usr.bin/groff/tmac/ru.KOI8-R Modified: user/ngie/more-tests/Makefile user/ngie/more-tests/Makefile.inc1 user/ngie/more-tests/ObsoleteFiles.inc user/ngie/more-tests/bin/sh/builtins.def user/ngie/more-tests/bin/sh/expand.c user/ngie/more-tests/bin/sh/parser.c user/ngie/more-tests/bin/sh/parser.h user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c user/ngie/more-tests/cddl/usr.bin/Makefile user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/privs/Makefile user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S user/ngie/more-tests/contrib/gcc/config/arm/crti.asm user/ngie/more-tests/contrib/gcc/config/arm/crtn.asm user/ngie/more-tests/contrib/gcc/config/arm/lib1funcs.asm user/ngie/more-tests/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c user/ngie/more-tests/etc/etc.aarch64/ttys user/ngie/more-tests/etc/rc.d/ugidfw user/ngie/more-tests/gnu/usr.bin/gdb/kgdb/trgt_amd64.c user/ngie/more-tests/gnu/usr.bin/groff/tmac/Makefile user/ngie/more-tests/lib/csu/arm/crti.S user/ngie/more-tests/lib/csu/arm/crtn.S user/ngie/more-tests/lib/libc/arm/aeabi/aeabi_asm_double.S user/ngie/more-tests/lib/libc/arm/aeabi/aeabi_asm_float.S user/ngie/more-tests/lib/libc/arm/aeabi/aeabi_vfp_double.S user/ngie/more-tests/lib/libc/arm/aeabi/aeabi_vfp_float.S user/ngie/more-tests/lib/libc/arm/gen/__aeabi_read_tp.S user/ngie/more-tests/lib/libc/arm/gen/_ctx_start.S user/ngie/more-tests/lib/libc/arm/gen/_setjmp.S user/ngie/more-tests/lib/libc/arm/gen/alloca.S user/ngie/more-tests/lib/libc/arm/gen/divsi3.S user/ngie/more-tests/lib/libc/arm/gen/setjmp.S user/ngie/more-tests/lib/libc/arm/gen/sigsetjmp.S user/ngie/more-tests/lib/libc/arm/string/ffs.S user/ngie/more-tests/lib/libc/arm/string/memcmp.S user/ngie/more-tests/lib/libc/arm/string/memcpy_arm.S user/ngie/more-tests/lib/libc/arm/string/memcpy_xscale.S user/ngie/more-tests/lib/libc/arm/string/memmove.S user/ngie/more-tests/lib/libc/arm/string/memset.S user/ngie/more-tests/lib/libc/arm/string/strcmp.S user/ngie/more-tests/lib/libc/arm/string/strlen.S user/ngie/more-tests/lib/libc/arm/string/strncmp.S user/ngie/more-tests/lib/libc/arm/sys/Ovfork.S user/ngie/more-tests/lib/libc/arm/sys/brk.S user/ngie/more-tests/lib/libc/arm/sys/cerror.S user/ngie/more-tests/lib/libc/arm/sys/pipe.S user/ngie/more-tests/lib/libc/arm/sys/ptrace.S user/ngie/more-tests/lib/libc/arm/sys/sbrk.S user/ngie/more-tests/lib/libc/arm/sys/shmat.S user/ngie/more-tests/lib/libc/arm/sys/sigreturn.S user/ngie/more-tests/lib/libc/arm/sys/syscall.S user/ngie/more-tests/lib/libc/gen/fts-compat.c user/ngie/more-tests/lib/libc/gen/wordexp.3 user/ngie/more-tests/lib/libc/gen/wordexp.c user/ngie/more-tests/lib/libc/sys/Makefile.inc user/ngie/more-tests/lib/libc/tests/stdio/fmemopen2_test.c user/ngie/more-tests/lib/libcompiler_rt/Makefile user/ngie/more-tests/lib/libugidfw/ugidfw.c user/ngie/more-tests/libexec/rtld-elf/arm/rtld_start.S user/ngie/more-tests/release/arm/BEAGLEBONE.conf user/ngie/more-tests/release/arm/CUBOX-HUMMINGBOARD.conf user/ngie/more-tests/release/arm/GUMSTIX.conf user/ngie/more-tests/release/arm/PANDABOARD.conf user/ngie/more-tests/release/arm/RPI-B.conf user/ngie/more-tests/release/arm/RPI2.conf user/ngie/more-tests/release/arm/WANDBOARD.conf user/ngie/more-tests/release/doc/en_US.ISO8859-1/hardware/article.xml user/ngie/more-tests/release/doc/share/misc/dev.archlist.txt user/ngie/more-tests/release/release.sh user/ngie/more-tests/release/tools/vmimage.subr user/ngie/more-tests/sbin/init/init.c user/ngie/more-tests/share/examples/mdoc/example.4 user/ngie/more-tests/share/man/man4/otusfw.4 user/ngie/more-tests/share/mk/local.gendirdeps.mk user/ngie/more-tests/share/mk/local.init.mk user/ngie/more-tests/share/mk/local.meta.sys.mk user/ngie/more-tests/sys/arm/broadcom/bcm2835/bcm2836_mp.c user/ngie/more-tests/sys/arm/mv/mpic.c user/ngie/more-tests/sys/arm64/arm64/exception.S user/ngie/more-tests/sys/arm64/arm64/pmap.c user/ngie/more-tests/sys/boot/efi/loader/copy.c user/ngie/more-tests/sys/cam/cam_compat.c user/ngie/more-tests/sys/cam/cam_periph.c user/ngie/more-tests/sys/cam/cam_periph.h user/ngie/more-tests/sys/cam/cam_xpt.c user/ngie/more-tests/sys/cam/ctl/ctl.c user/ngie/more-tests/sys/cam/ctl/ctl.h user/ngie/more-tests/sys/cam/ctl/ctl_backend.h user/ngie/more-tests/sys/cam/ctl/ctl_backend_block.c user/ngie/more-tests/sys/cam/ctl/ctl_backend_ramdisk.c user/ngie/more-tests/sys/cam/ctl/ctl_cmd_table.c user/ngie/more-tests/sys/cam/ctl/ctl_error.c user/ngie/more-tests/sys/cam/ctl/ctl_error.h user/ngie/more-tests/sys/cam/ctl/ctl_io.h user/ngie/more-tests/sys/cam/ctl/ctl_private.h user/ngie/more-tests/sys/cam/ctl/ctl_tpc.c user/ngie/more-tests/sys/cam/scsi/scsi_cd.h user/ngie/more-tests/sys/cam/scsi/scsi_pass.c user/ngie/more-tests/sys/cam/scsi/scsi_sg.c user/ngie/more-tests/sys/cam/scsi/scsi_target.c user/ngie/more-tests/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c user/ngie/more-tests/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h user/ngie/more-tests/sys/cddl/dev/dtrace/amd64/dtrace_isa.c user/ngie/more-tests/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c user/ngie/more-tests/sys/cddl/dev/sdt/sdt.c user/ngie/more-tests/sys/compat/linux/linux_dtrace.h user/ngie/more-tests/sys/dev/acpica/acpi.c user/ngie/more-tests/sys/dev/ath/if_ath_ahb.c user/ngie/more-tests/sys/dev/ath/if_ath_pci.c user/ngie/more-tests/sys/dev/ath/if_athvar.h user/ngie/more-tests/sys/dev/drm2/i915/i915_gem_execbuffer.c user/ngie/more-tests/sys/dev/iwn/if_iwn.c user/ngie/more-tests/sys/dev/usb/wlan/if_rsu.c user/ngie/more-tests/sys/dev/usb/wlan/if_rsureg.h user/ngie/more-tests/sys/dev/usb/wlan/if_urtwn.c user/ngie/more-tests/sys/kern/kern_exec.c user/ngie/more-tests/sys/kern/kern_exit.c user/ngie/more-tests/sys/kern/kern_fork.c user/ngie/more-tests/sys/kern/kern_proc.c user/ngie/more-tests/sys/kern/kern_racct.c user/ngie/more-tests/sys/kern/kern_shutdown.c user/ngie/more-tests/sys/kern/kern_sig.c user/ngie/more-tests/sys/kern/kern_timeout.c user/ngie/more-tests/sys/kern/vfs_bio.c user/ngie/more-tests/sys/kern/vfs_cache.c user/ngie/more-tests/sys/kern/vfs_default.c user/ngie/more-tests/sys/kern/vfs_lookup.c user/ngie/more-tests/sys/kern/vfs_syscalls.c user/ngie/more-tests/sys/kern/vfs_vnops.c user/ngie/more-tests/sys/modules/otus/Makefile user/ngie/more-tests/sys/modules/usb/rsu/Makefile user/ngie/more-tests/sys/modules/usb/urtwn/Makefile user/ngie/more-tests/sys/net80211/ieee80211_crypto_ccmp.c user/ngie/more-tests/sys/net80211/ieee80211_crypto_tkip.c user/ngie/more-tests/sys/net80211/ieee80211_crypto_wep.c user/ngie/more-tests/sys/net80211/ieee80211_proto.c user/ngie/more-tests/sys/net80211/ieee80211_superg.c user/ngie/more-tests/sys/net80211/ieee80211_var.h user/ngie/more-tests/sys/netinet/ip_ipsec.c user/ngie/more-tests/sys/netinet/tcp_subr.c user/ngie/more-tests/sys/netinet6/ip6_ipsec.c user/ngie/more-tests/sys/netipsec/ipsec_output.c user/ngie/more-tests/sys/netipsec/xform_ah.c user/ngie/more-tests/sys/netipsec/xform_esp.c user/ngie/more-tests/sys/netipsec/xform_ipcomp.c user/ngie/more-tests/sys/sys/buf.h user/ngie/more-tests/sys/sys/file.h user/ngie/more-tests/sys/sys/sdt.h user/ngie/more-tests/sys/sys/systm.h user/ngie/more-tests/sys/tools/vnode_if.awk user/ngie/more-tests/sys/vm/vm_object.c user/ngie/more-tests/sys/vm/vm_object.h user/ngie/more-tests/sys/vm/vm_page.c user/ngie/more-tests/sys/vm/vm_page.h user/ngie/more-tests/targets/pseudo/bootstrap-tools/Makefile user/ngie/more-tests/targets/pseudo/stage/Makefile user/ngie/more-tests/targets/pseudo/userland/cddl/Makefile.depend user/ngie/more-tests/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/more-tests/usr.bin/systat/main.c user/ngie/more-tests/usr.bin/truss/amd64-fbsd.c user/ngie/more-tests/usr.bin/truss/amd64-fbsd32.c user/ngie/more-tests/usr.bin/truss/amd64-linux32.c user/ngie/more-tests/usr.bin/truss/arm-fbsd.c user/ngie/more-tests/usr.bin/truss/extern.h user/ngie/more-tests/usr.bin/truss/i386-fbsd.c user/ngie/more-tests/usr.bin/truss/i386-linux.c user/ngie/more-tests/usr.bin/truss/main.c user/ngie/more-tests/usr.bin/truss/mips-fbsd.c user/ngie/more-tests/usr.bin/truss/powerpc-fbsd.c user/ngie/more-tests/usr.bin/truss/powerpc64-fbsd.c user/ngie/more-tests/usr.bin/truss/setup.c user/ngie/more-tests/usr.bin/truss/sparc64-fbsd.c user/ngie/more-tests/usr.bin/truss/syscall.h user/ngie/more-tests/usr.bin/truss/syscalls.c user/ngie/more-tests/usr.bin/truss/truss.h user/ngie/more-tests/usr.bin/usbhidaction/usbhidaction.c user/ngie/more-tests/usr.sbin/bhyve/pci_virtio_net.c user/ngie/more-tests/usr.sbin/etcupdate/etcupdate.8 user/ngie/more-tests/usr.sbin/mergemaster/mergemaster.8 user/ngie/more-tests/usr.sbin/rpcbind/rpcb_svc_com.c Directory Properties: user/ngie/more-tests/ (props changed) user/ngie/more-tests/cddl/ (props changed) user/ngie/more-tests/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzfs/ (props changed) user/ngie/more-tests/contrib/compiler-rt/ (props changed) user/ngie/more-tests/contrib/gcc/ (props changed) user/ngie/more-tests/gnu/usr.bin/gdb/ (props changed) user/ngie/more-tests/lib/libc/ (props changed) user/ngie/more-tests/sbin/ (props changed) user/ngie/more-tests/share/ (props changed) user/ngie/more-tests/share/man/man4/ (props changed) user/ngie/more-tests/sys/ (props changed) user/ngie/more-tests/sys/boot/ (props changed) user/ngie/more-tests/sys/cddl/contrib/opensolaris/ (props changed) user/ngie/more-tests/targets/ (props changed) user/ngie/more-tests/usr.sbin/bhyve/ (props changed) Modified: user/ngie/more-tests/Makefile ============================================================================== --- user/ngie/more-tests/Makefile Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/Makefile Fri Oct 2 05:30:46 2015 (r288474) @@ -243,9 +243,9 @@ cleanworld: # Handle the user-driven targets, using the source relative mk files. # -.if empty(.MAKEFLAGS:M-n) +.if !(!empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n") # skip this for -n to avoid changing previous behavior of -# 'make -n buildworld' etc. +# 'make -n buildworld' etc. Using -n -n will run it. ${TGTS}: .MAKE tinderbox toolchains kernel-toolchains: .MAKE .endif Modified: user/ngie/more-tests/Makefile.inc1 ============================================================================== --- user/ngie/more-tests/Makefile.inc1 Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/Makefile.inc1 Fri Oct 2 05:30:46 2015 (r288474) @@ -1497,7 +1497,7 @@ _btxld= usr.sbin/btxld # Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures # resulting from missing bug fixes or ELF Toolchain updates. .if ${MK_CDDL} != "no" -_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \ +_dtrace_tools= cddl/lib/libctf cddl/usr.bin/ctfconvert \ cddl/usr.bin/ctfmerge .endif Modified: user/ngie/more-tests/ObsoleteFiles.inc ============================================================================== --- user/ngie/more-tests/ObsoleteFiles.inc Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/ObsoleteFiles.inc Fri Oct 2 05:30:46 2015 (r288474) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20150928: unused sgsmsg utility is removed +OLD_FILES+=usr/bin/sgsmsg # 20150926: remove links to removed/unimplemented mbuf(9) macros OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz Modified: user/ngie/more-tests/bin/sh/builtins.def ============================================================================== --- user/ngie/more-tests/bin/sh/builtins.def Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/bin/sh/builtins.def Fri Oct 2 05:30:46 2015 (r288474) @@ -65,6 +65,7 @@ exportcmd -s export -s readonly #exprcmd expr falsecmd false fgcmd -j fg +freebsd_wordexpcmd freebsd_wordexp getoptscmd getopts hashcmd hash histcmd -h fc Modified: user/ngie/more-tests/bin/sh/expand.c ============================================================================== --- user/ngie/more-tests/bin/sh/expand.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/bin/sh/expand.c Fri Oct 2 05:30:46 2015 (r288474) @@ -1656,3 +1656,57 @@ wordexpcmd(int argc, char **argv) outbin(argv[i], strlen(argv[i]) + 1, out1); return (0); } + +/* + * Do most of the work for wordexp(3), new version. + */ + +int +freebsd_wordexpcmd(int argc __unused, char **argv __unused) +{ + struct arglist arglist; + union node *args, *n; + struct strlist *sp; + size_t count, len; + int ch; + int protected = 0; + int fd = -1; + + while ((ch = nextopt("f:p")) != '\0') { + switch (ch) { + case 'f': + fd = number(shoptarg); + break; + case 'p': + protected = 1; + break; + } + } + if (*argptr != NULL) + error("wrong number of arguments"); + if (fd < 0) + error("missing fd"); + INTOFF; + setinputfd(fd, 1); + INTON; + args = parsewordexp(); + popfile(); /* will also close fd */ + if (protected) + for (n = args; n != NULL; n = n->narg.next) { + if (n->narg.backquote != NULL) { + outcslow('C', out1); + error("command substitution disabled"); + } + } + outcslow(' ', out1); + arglist.lastp = &arglist.list; + for (n = args; n != NULL; n = n->narg.next) + expandarg(n, &arglist, EXP_FULL | EXP_TILDE); + *arglist.lastp = NULL; + for (sp = arglist.list, count = len = 0; sp; sp = sp->next) + count++, len += strlen(sp->text); + out1fmt("%016zx %016zx", count, len); + for (sp = arglist.list; sp; sp = sp->next) + outbin(sp->text, strlen(sp->text) + 1, out1); + return (0); +} Modified: user/ngie/more-tests/bin/sh/parser.c ============================================================================== --- user/ngie/more-tests/bin/sh/parser.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/bin/sh/parser.c Fri Oct 2 05:30:46 2015 (r288474) @@ -231,6 +231,39 @@ parsecmd(int interact) } +/* + * Read and parse words for wordexp. + * Returns a list of NARG nodes; NULL if there are no words. + */ +union node * +parsewordexp(void) +{ + union node *n, *first = NULL, **pnext; + int t; + + /* This assumes the parser is not re-entered, + * which could happen if we add command substitution on PS1/PS2. + */ + parser_temp_free_all(); + heredoclist = NULL; + + tokpushback = 0; + checkkwd = 0; + doprompt = 0; + setprompt(0); + needprompt = 0; + pnext = &first; + while ((t = readtoken()) != TEOF) { + if (t != TWORD) + synexpect(TWORD); + n = makename(); + *pnext = n; + pnext = &n->narg.next; + } + return first; +} + + static union node * list(int nlflag) { Modified: user/ngie/more-tests/bin/sh/parser.h ============================================================================== --- user/ngie/more-tests/bin/sh/parser.h Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/bin/sh/parser.h Fri Oct 2 05:30:46 2015 (r288474) @@ -76,6 +76,7 @@ extern const char *const parsekwd[]; union node *parsecmd(int); +union node *parsewordexp(void); void forcealias(void); void fixredir(union node *, const char *, int); int goodname(const char *); Copied: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh (from r288473, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.kpriv.ksh Fri Oct 2 05:30:46 2015 (r288474, copy of r288473, head/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 Copied: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d (from r288473, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.bigglobal.d Fri Oct 2 05:30:46 2015 (r288474, copy of r288473, head/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: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d (from r288473, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/err.biglocal.d Fri Oct 2 05:30:46 2015 (r288474, copy of r288473, head/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: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -69,7 +69,7 @@ prov.h: prov.d $dtrace -h -s prov.d prov.o: prov.d main.o - $dtrace -G -32 -s prov.d main.o + $dtrace -G -s prov.d main.o EOF cat > prov.d <<EOF Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.eliminate.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -77,7 +77,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -66,7 +66,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -82,7 +82,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -75,7 +75,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -76,7 +76,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -70,7 +70,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -71,7 +71,7 @@ EOF exit 1 fi - $dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o + $dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o if [ $? -ne 0 ]; then print -u2 "failed to process $oogle.d" Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -47,7 +47,7 @@ provider doogle { EOF cc -c test.c -$dtrace -G -32 -s doogle.d test.o -o doogle.d.o +$dtrace -G -s doogle.d test.o -o doogle.d.o if [ $? -eq 0 ]; then print -u2 "dtrace succeeded despite having no probe sites" Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -56,7 +56,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -57,7 +57,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -68,7 +68,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -72,13 +72,13 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create initial DOF" exit 1 fi rm -f prov.o -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create final DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh Fri Oct 2 05:30:46 2015 (r288474) @@ -67,7 +67,7 @@ if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 fi -$dtrace -G -32 -s prov.d test.o +$dtrace -G -s prov.d test.o if [ $? -ne 0 ]; then print -u2 "failed to create DOF" exit 1 Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 Fri Oct 2 05:30:46 2015 (r288474) @@ -21,7 +21,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 24, 2015 +.Dd September 29, 2015 .Dt LOCKSTAT 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Op Fl d Ar duration .Op Fl f Ar function Oo Ns , Ns Ar size Oc .Op Fl T -.Op Fl ckgwWRpP +.Op Fl kgwWRpP .Op Fl D Ar count .Op Fl o filename .Op Fl x Ar opt Oo Ns = Ns Ar val Oc @@ -172,8 +172,6 @@ This is off by default. .El .Ss Data Reporting .Bl -tag -width indent -.It Fl c -Coalesce lock data for lock arrays. .It Fl D Ar count Only display the top .Ar count Modified: user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Fri Oct 2 05:30:46 2015 (r288474) @@ -65,7 +65,11 @@ typedef uintptr_t pc_t; typedef struct lsrec { struct lsrec *ls_next; /* next in hash chain */ +#ifdef illumos uintptr_t ls_lock; /* lock address */ +#else + char *ls_lock; /* lock name */ +#endif uintptr_t ls_caller; /* caller address */ uint32_t ls_count; /* cumulative event count */ uint32_t ls_event; /* type of event */ @@ -338,7 +342,9 @@ usage(void) " -d duration only watch events longer than <duration>\n" " -T trace (rather than sample) events\n" "\nData reporting options:\n\n" +#ifdef illumos " -c coalesce lock data for arrays like pse_mutex[]\n" +#endif " -k coalesce PCs within functions\n" " -g show total events generated by function\n" " -w wherever: don't distinguish events by caller\n" @@ -381,12 +387,16 @@ lockcmp(lsrec_t *a, lsrec_t *b) if (a->ls_caller > b->ls_caller) return (1); +#ifdef illumos if (a->ls_lock < b->ls_lock) return (-1); if (a->ls_lock > b->ls_lock) return (1); return (0); +#else + return (strcmp(a->ls_lock, b->ls_lock)); +#endif } static int @@ -424,26 +434,40 @@ lockcmp_anywhere(lsrec_t *a, lsrec_t *b) if (a->ls_event > b->ls_event) return (1); +#ifdef illumos if (a->ls_lock < b->ls_lock) return (-1); if (a->ls_lock > b->ls_lock) return (1); return (0); +#else + return (strcmp(a->ls_lock, b->ls_lock)); +#endif } static int lock_and_count_cmp_anywhere(lsrec_t *a, lsrec_t *b) { +#ifndef illumos + int cmp; +#endif + if (a->ls_event < b->ls_event) return (-1); if (a->ls_event > b->ls_event) return (1); +#ifdef illumos if (a->ls_lock < b->ls_lock) return (-1); if (a->ls_lock > b->ls_lock) return (1); +#else + cmp = strcmp(a->ls_lock, b->ls_lock); + if (cmp != 0) + return (cmp); +#endif return (b->ls_count - a->ls_count); } @@ -698,7 +722,11 @@ dprog_addevent(int event) caller = "(uintptr_t)arg0"; arg1 = "arg2"; } else { +#ifdef illumos arg0 = "(uintptr_t)arg0"; +#else + arg0 = "stringof(args[0]->lock_object.lo_name)"; +#endif caller = "caller"; } @@ -912,12 +940,17 @@ lsrec_fill(lsrec_t *lsrec, const dtrace_ lsrec->ls_event = (uint32_t)*((uint64_t *)(data + rec->dtrd_offset)); rec++; +#ifdef illumos if (rec->dtrd_size != sizeof (uintptr_t)) fail(0, "bad lock address size in second record"); /* LINTED - alignment */ lsrec->ls_lock = *((uintptr_t *)(data + rec->dtrd_offset)); rec++; +#else + lsrec->ls_lock = strdup((const char *)(data + rec->dtrd_offset)); + rec++; +#endif if (rec->dtrd_size != sizeof (uintptr_t)) fail(0, "bad caller size in third record"); @@ -1224,9 +1257,11 @@ main(int argc, char **argv) events_specified = 1; break; +#ifdef illumos case 'c': g_cflag = 1; break; +#endif case 'k': g_kflag = 1; @@ -1539,6 +1574,9 @@ main(int argc, char **argv) caller_in_stack = 1; bcopy(oldlsp, lsp, LS_TIME); lsp->ls_caller = oldlsp->ls_stack[fr]; +#ifndef illumos + lsp->ls_lock = strdup(oldlsp->ls_lock); +#endif /* LINTED - alignment */ lsp = (lsrec_t *)((char *)lsp + LS_TIME); } @@ -1547,6 +1585,9 @@ main(int argc, char **argv) /* LINTED - alignment */ lsp = (lsrec_t *)((char *)lsp + LS_TIME); } +#ifndef illumos + free(oldlsp->ls_lock); +#endif } g_nrecs = g_nrecs_used = ((uintptr_t)lsp - (uintptr_t)newlsp) / LS_TIME; @@ -1604,8 +1645,10 @@ main(int argc, char **argv) for (i = 0; i < g_nrecs_used; i++) { int fr; lsp = sort_buf[i]; +#ifdef illumos if (g_cflag) coalesce_symbol(&lsp->ls_lock); +#endif if (g_kflag) { for (fr = 0; fr < g_stkdepth; fr++) coalesce_symbol(&lsp->ls_stack[fr]); @@ -1659,6 +1702,15 @@ main(int argc, char **argv) first = current; } +#ifndef illumos + /* + * Free lock name buffers + */ + for (i = 0, lsp = (lsrec_t *)data_buf; i < g_nrecs_used; i++, + lsp = (lsrec_t *)((char *)lsp + g_recsize)) + free(lsp->ls_lock); +#endif + return (0); } @@ -1748,8 +1800,12 @@ report_stats(FILE *out, lsrec_t **sort_b (void) fprintf(out, "%u %u", lsp->ls_event, lsp->ls_count); +#ifdef illumos (void) fprintf(out, " %s", format_symbol(buf, lsp->ls_lock, g_cflag)); +#else + (void) fprintf(out, " %s", lsp->ls_lock); +#endif (void) fprintf(out, " %s", format_symbol(buf, lsp->ls_caller, 0)); (void) fprintf(out, " %f", @@ -1811,8 +1867,12 @@ report_stats(FILE *out, lsrec_t **sort_b (void) fprintf(out, "%4.2f %8s ", (double)lsp->ls_refcnt / lsp->ls_count, buf); +#ifdef illumos (void) fprintf(out, "%-22s ", format_symbol(buf, lsp->ls_lock, g_cflag)); +#else + (void) fprintf(out, "%-22s ", lsp->ls_lock); +#endif (void) fprintf(out, "%-24s\n", format_symbol(buf, lsp->ls_caller, 0)); @@ -1908,7 +1968,11 @@ report_trace(FILE *out, lsrec_t **sort_b (void) fprintf(out, "%2d %10llu %11p %-24s %-24s\n", lsp->ls_event, (unsigned long long)lsp->ls_time, (void *)lsp->ls_next, +#ifdef illumos format_symbol(buf, lsp->ls_lock, 0), +#else + lsp->ls_lock, +#endif format_symbol(buf2, lsp->ls_caller, 0)); if (rectype <= LS_STACK(0)) Modified: user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c Fri Oct 2 05:30:46 2015 (r288474) @@ -55,7 +55,6 @@ #include "zfs_prop.h" #include "zfeature_common.h" -int aok; int libzfs_errno(libzfs_handle_t *hdl) Modified: user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c ============================================================================== --- user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fri Oct 2 05:30:46 2015 (r288474) @@ -45,7 +45,9 @@ * Emulation of kernel services in userland. */ +#ifndef __FreeBSD__ int aok; +#endif uint64_t physmem; vnode_t *rootdir = (vnode_t *)0xabcd1234; char hw_serial[HW_HOSTID_LEN]; Modified: user/ngie/more-tests/cddl/usr.bin/Makefile ============================================================================== --- user/ngie/more-tests/cddl/usr.bin/Makefile Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/usr.bin/Makefile Fri Oct 2 05:30:46 2015 (r288474) @@ -6,7 +6,6 @@ SUBDIR= \ ctfconvert \ ctfdump \ ctfmerge \ - sgsmsg \ ${_tests} \ ${_zinject} \ ${_zlook} \ Modified: user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/privs/Makefile ============================================================================== --- user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Fri Oct 2 05:30:46 2015 (r288474) @@ -8,6 +8,7 @@ TESTFILES= \ tst.fds.ksh \ tst.func_access.ksh \ tst.getf.ksh \ + tst.kpriv.ksh \ tst.op_access.ksh \ tst.procpriv.ksh \ tst.providers.ksh \ Modified: user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile ============================================================================== --- user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Fri Oct 2 05:30:46 2015 (r288474) @@ -14,6 +14,8 @@ TESTFILES= \ err.D_OP_INCOMPAT.dupltype.d \ err.D_OP_INCOMPAT.dupttype.d \ err.D_SYNTAX.declare.d \ + err.bigglobal.d \ + err.biglocal.d \ tst.basicvar.d \ tst.basicvar.d.out \ tst.localvar.d \ Modified: user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S ============================================================================== --- user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcmp.S Fri Oct 2 05:30:46 2015 (r288474) @@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memcmp) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcmp4, __aeabi_memcmp) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcmp8, __aeabi_memcmp) + + .section .note.GNU-stack,"",%progbits Modified: user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S ============================================================================== --- user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memcpy.S Fri Oct 2 05:30:46 2015 (r288474) @@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memcpy) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcpy4, __aeabi_memcpy) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memcpy8, __aeabi_memcpy) + + .section .note.GNU-stack,"",%progbits Modified: user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S ============================================================================== --- user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memmove.S Fri Oct 2 05:30:46 2015 (r288474) @@ -18,3 +18,5 @@ END_COMPILERRT_FUNCTION(__aeabi_memmove) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memmove4, __aeabi_memmove) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memmove8, __aeabi_memmove) + + .section .note.GNU-stack,"",%progbits Modified: user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S ============================================================================== --- user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/compiler-rt/lib/builtins/arm/aeabi_memset.S Fri Oct 2 05:30:46 2015 (r288474) @@ -32,3 +32,4 @@ END_COMPILERRT_FUNCTION(__aeabi_memclr) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr4, __aeabi_memclr) DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr8, __aeabi_memclr) + .section .note.GNU-stack,"",%progbits Modified: user/ngie/more-tests/contrib/gcc/config/arm/crti.asm ============================================================================== --- user/ngie/more-tests/contrib/gcc/config/arm/crti.asm Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/gcc/config/arm/crti.asm Fri Oct 2 05:30:46 2015 (r288474) @@ -60,6 +60,8 @@ .file "crti.asm" + .section .note.GNU-stack,"",%progbits + .section ".init" .align 2 .global _init Modified: user/ngie/more-tests/contrib/gcc/config/arm/crtn.asm ============================================================================== --- user/ngie/more-tests/contrib/gcc/config/arm/crtn.asm Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/gcc/config/arm/crtn.asm Fri Oct 2 05:30:46 2015 (r288474) @@ -68,6 +68,8 @@ .file "crtn.asm" + .section .note.GNU-stack,"",%progbits + .section ".init" ;; FUNC_END Modified: user/ngie/more-tests/contrib/gcc/config/arm/lib1funcs.asm ============================================================================== --- user/ngie/more-tests/contrib/gcc/config/arm/lib1funcs.asm Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/gcc/config/arm/lib1funcs.asm Fri Oct 2 05:30:46 2015 (r288474) @@ -1305,3 +1305,5 @@ LSYM(Lchange_\register): #include "ieee754-sf.S" #include "bpabi.S" #endif /* __symbian__ */ + + .section .note.GNU-stack,"",%progbits Modified: user/ngie/more-tests/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c ============================================================================== --- user/ngie/more-tests/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Fri Oct 2 05:30:46 2015 (r288474) @@ -53,6 +53,8 @@ run(int n, ...) va_start(va, n); #if defined(__FreeBSD__) && defined(__amd64__) for (i = 0; i < 5; i++) { +#elif defined(__FreeBSD__) && defined(__aarch64__) + for (i = 0; i < 7; i++) { #else for (i = 0; i < 9; i++) { #endif @@ -116,6 +118,10 @@ ATF_TC_BODY(setcontext_link, tc) /* FreeBSD/amd64 only permits up to 6 arguments. */ makecontext(&uc[i], (void *)run, 6, i, 0, 1, 2, 3, 4); +#elif defined(__FreeBSD__) && defined(__aarch64__) + /* FreeBSD/arm64 only permits up to 8 arguments. */ + makecontext(&uc[i], (void *)run, 8, i, + 0, 1, 2, 3, 4, 5, 6); #else makecontext(&uc[i], (void *)run, 10, i, 0, 1, 2, 3, 4, 5, 6, 7, 8); Modified: user/ngie/more-tests/etc/etc.aarch64/ttys ============================================================================== --- user/ngie/more-tests/etc/etc.aarch64/ttys Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/etc/etc.aarch64/ttys Fri Oct 2 05:30:46 2015 (r288474) @@ -29,7 +29,7 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" xterm off secure +ttyv0 "/usr/libexec/getty Pc" xterm onifconsole secure # Virtual terminals ttyv1 "/usr/libexec/getty Pc" xterm off secure ttyv2 "/usr/libexec/getty Pc" xterm off secure @@ -41,9 +41,9 @@ ttyv7 "/usr/libexec/getty Pc" xterm off #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyu0 "/usr/libexec/getty std.9600" vt100 on secure -ttyu1 "/usr/libexec/getty std.9600" dialup off secure -ttyu2 "/usr/libexec/getty std.9600" dialup off secure -ttyu3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure +ttyu1 "/usr/libexec/getty 3wire" vt100 onifconsole secure +ttyu2 "/usr/libexec/getty 3wire" vt100 onifconsole secure +ttyu3 "/usr/libexec/getty 3wire" vt100 onifconsole secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure Modified: user/ngie/more-tests/etc/rc.d/ugidfw ============================================================================== --- user/ngie/more-tests/etc/rc.d/ugidfw Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/etc/rc.d/ugidfw Fri Oct 2 05:30:46 2015 (r288474) @@ -3,6 +3,7 @@ # $FreeBSD$ # PROVIDE: ugidfw +# REQUIRE: FILESYSTEMS # BEFORE: LOGIN # KEYWORD: nojail shutdown @@ -33,9 +34,17 @@ ugidfw_start() ugidfw_stop() { + local rulecount + # Disable the policy # - kldunload mac_bsdextended + # Check for the existence of rules and flush them if needed. + rulecount=$(sysctl -in security.mac.bsdextended.rule_count) + if [ ${rulecount:-0} -gt 0 ]; then + ugidfw list | sed -n '2,$p' | cut -d ' ' -f 1 | sort -r -n | + xargs -n 1 ugidfw remove + echo "MAC bsdextended rules flushed." + fi } load_rc_config $name Modified: user/ngie/more-tests/gnu/usr.bin/gdb/kgdb/trgt_amd64.c ============================================================================== --- user/ngie/more-tests/gnu/usr.bin/gdb/kgdb/trgt_amd64.c Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/gnu/usr.bin/gdb/kgdb/trgt_amd64.c Fri Oct 2 05:30:46 2015 (r288474) @@ -72,7 +72,6 @@ kgdb_trgt_fetch_registers(int regno __un supply_register(AMD64_R8_REGNUM + 6, (char *)&pcb.pcb_r14); supply_register(AMD64_R15_REGNUM, (char *)&pcb.pcb_r15); supply_register(AMD64_RIP_REGNUM, (char *)&pcb.pcb_rip); - amd64_supply_fxsave(current_regcache, -1, (struct fpusave *)(&pcb + 1)); } void Modified: user/ngie/more-tests/gnu/usr.bin/groff/tmac/Makefile ============================================================================== --- user/ngie/more-tests/gnu/usr.bin/groff/tmac/Makefile Fri Oct 2 05:27:12 2015 (r288473) +++ user/ngie/more-tests/gnu/usr.bin/groff/tmac/Makefile Fri Oct 2 05:30:46 2015 (r288474) @@ -14,7 +14,7 @@ MLINKS= groff_ms.7 ms.7 MLINKS+= groff_me.7 me.7 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510020530.t925UljI007325>