Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Nov 2015 01:05:54 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r291346 - in user/ngie/more-tests2: bin/rmail bin/sh cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl/lib/libzfs cddl/lib/li...
Message-ID:  <201511260105.tAQ15sYm099540@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Thu Nov 26 01:05:54 2015
New Revision: 291346
URL: https://svnweb.freebsd.org/changeset/base/291346

Log:
  MFhead @ r291345

Added:
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
     - copied unchanged from r291345, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
  user/ngie/more-tests2/share/ctypedef/Makefile.depend
     - copied unchanged from r291345, head/share/ctypedef/Makefile.depend
  user/ngie/more-tests2/share/dtrace/retval
     - copied unchanged from r291345, head/share/dtrace/retval
  user/ngie/more-tests2/share/monetdef/Makefile.depend
     - copied unchanged from r291345, head/share/monetdef/Makefile.depend
  user/ngie/more-tests2/share/msgdef/Makefile.depend
     - copied unchanged from r291345, head/share/msgdef/Makefile.depend
  user/ngie/more-tests2/share/numericdef/Makefile.depend
     - copied unchanged from r291345, head/share/numericdef/Makefile.depend
  user/ngie/more-tests2/share/timedef/Makefile.depend
     - copied unchanged from r291345, head/share/timedef/Makefile.depend
  user/ngie/more-tests2/sys/modules/if_enc/
     - copied from r291345, head/sys/modules/if_enc/
  user/ngie/more-tests2/tools/tools/indent_wrapper/
     - copied from r291345, head/tools/tools/indent_wrapper/
  user/ngie/more-tests2/usr.bin/cxxfilt/Makefile.depend
     - copied unchanged from r291345, head/usr.bin/cxxfilt/Makefile.depend
  user/ngie/more-tests2/usr.bin/localedef/Makefile.depend
     - copied unchanged from r291345, head/usr.bin/localedef/Makefile.depend
Deleted:
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/Makefile.inc1
  user/ngie/more-tests2/lib/libmd/Makefile.depend.host
  user/ngie/more-tests2/usr.bin/xinstall/Makefile.depend.host
Modified:
  user/ngie/more-tests2/bin/rmail/Makefile
  user/ngie/more-tests2/bin/sh/mknodes.c
  user/ngie/more-tests2/bin/sh/nodes.c.pat
  user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend
  user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile
  user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
  user/ngie/more-tests2/contrib/bmake/parse.c
  user/ngie/more-tests2/crypto/openssh/sshd_config
  user/ngie/more-tests2/gnu/lib/libdialog/Makefile.depend
  user/ngie/more-tests2/gnu/lib/libgcc/Makefile.depend
  user/ngie/more-tests2/gnu/lib/libgomp/Makefile.depend
  user/ngie/more-tests2/gnu/lib/libreadline/readline/Makefile
  user/ngie/more-tests2/gnu/lib/libregex/Makefile.depend
  user/ngie/more-tests2/gnu/lib/libstdc++/Makefile
  user/ngie/more-tests2/gnu/lib/libstdc++/Makefile.depend
  user/ngie/more-tests2/gnu/lib/libsupc++/Makefile
  user/ngie/more-tests2/gnu/lib/libsupc++/Makefile.depend
  user/ngie/more-tests2/gnu/usr.bin/binutils/ld/Makefile
  user/ngie/more-tests2/gnu/usr.bin/cc/cc_tools/Makefile
  user/ngie/more-tests2/include/Makefile
  user/ngie/more-tests2/include/mk-osreldate.sh
  user/ngie/more-tests2/kerberos5/lib/libasn1/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libgssapi_krb5/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libgssapi_ntlm/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libgssapi_spnego/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libhdb/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libheimbase/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libheimipcc/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libheimipcs/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libheimntlm/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libhx509/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libkadm5clnt/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libkadm5srv/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libkafs5/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libkdc/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libkrb5/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libroken/Makefile.depend
  user/ngie/more-tests2/kerberos5/lib/libwind/Makefile.depend
  user/ngie/more-tests2/lib/atf/libatf-c++/Makefile.depend
  user/ngie/more-tests2/lib/atf/libatf-c/Makefile.depend
  user/ngie/more-tests2/lib/clang/clang.build.mk
  user/ngie/more-tests2/lib/libalias/libalias/Makefile.depend
  user/ngie/more-tests2/lib/libarchive/Makefile.depend
  user/ngie/more-tests2/lib/libarchive/tests/Makefile
  user/ngie/more-tests2/lib/libauditd/Makefile.depend
  user/ngie/more-tests2/lib/libbegemot/Makefile.depend
  user/ngie/more-tests2/lib/libblocksruntime/Makefile.depend
  user/ngie/more-tests2/lib/libbluetooth/Makefile.depend
  user/ngie/more-tests2/lib/libbsm/Makefile.depend
  user/ngie/more-tests2/lib/libbsnmp/libbsnmp/Makefile.depend
  user/ngie/more-tests2/lib/libbz2/Makefile.depend
  user/ngie/more-tests2/lib/libc++/Makefile
  user/ngie/more-tests2/lib/libc/gdtoa/Makefile.inc
  user/ngie/more-tests2/lib/libc/gen/Makefile.inc
  user/ngie/more-tests2/lib/libc/locale/Makefile.inc
  user/ngie/more-tests2/lib/libc/stdio/Makefile.inc
  user/ngie/more-tests2/lib/libc/stdlib/jemalloc/Makefile.inc
  user/ngie/more-tests2/lib/libc/tests/rpc/Makefile
  user/ngie/more-tests2/lib/libcalendar/Makefile.depend
  user/ngie/more-tests2/lib/libcam/Makefile.depend
  user/ngie/more-tests2/lib/libcapsicum/Makefile.depend
  user/ngie/more-tests2/lib/libcom_err/Makefile.depend
  user/ngie/more-tests2/lib/libcrypt/Makefile
  user/ngie/more-tests2/lib/libcrypt/Makefile.depend
  user/ngie/more-tests2/lib/libcuse/Makefile.depend
  user/ngie/more-tests2/lib/libcxxrt/Makefile.depend
  user/ngie/more-tests2/lib/libdevinfo/Makefile.depend
  user/ngie/more-tests2/lib/libdevstat/Makefile.depend
  user/ngie/more-tests2/lib/libdpv/Makefile.depend
  user/ngie/more-tests2/lib/libdwarf/Makefile
  user/ngie/more-tests2/lib/libdwarf/Makefile.depend
  user/ngie/more-tests2/lib/libedit/Makefile.depend
  user/ngie/more-tests2/lib/libelf/Makefile
  user/ngie/more-tests2/lib/libelf/Makefile.depend
  user/ngie/more-tests2/lib/libexecinfo/Makefile.depend
  user/ngie/more-tests2/lib/libexpat/Makefile.depend
  user/ngie/more-tests2/lib/libfetch/Makefile.depend
  user/ngie/more-tests2/lib/libfigpar/Makefile.depend
  user/ngie/more-tests2/lib/libgeom/Makefile.depend
  user/ngie/more-tests2/lib/libgpio/Makefile.depend
  user/ngie/more-tests2/lib/libgssapi/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/BIG5/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/DECHanyu/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/EUC/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/EUCTW/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/GBK2K/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/HZ/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/ISO2022/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/JOHAB/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/MSKanji/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/UES/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/UTF1632/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/UTF7/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/UTF8/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/VIQR/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/ZW/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/iconv_none/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/iconv_std/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/mapper_646/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/mapper_none/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/mapper_parallel/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/mapper_serial/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/mapper_std/Makefile.depend
  user/ngie/more-tests2/lib/libiconv_modules/mapper_zone/Makefile.depend
  user/ngie/more-tests2/lib/libipsec/Makefile.depend
  user/ngie/more-tests2/lib/libjail/Makefile.depend
  user/ngie/more-tests2/lib/libkiconv/Makefile.depend
  user/ngie/more-tests2/lib/libkvm/Makefile.depend
  user/ngie/more-tests2/lib/libldns/Makefile.depend
  user/ngie/more-tests2/lib/liblzma/Makefile.depend
  user/ngie/more-tests2/lib/libmagic/Makefile.depend
  user/ngie/more-tests2/lib/libmd/Makefile.depend
  user/ngie/more-tests2/lib/libmemstat/Makefile.depend
  user/ngie/more-tests2/lib/libmilter/Makefile
  user/ngie/more-tests2/lib/libmilter/Makefile.depend
  user/ngie/more-tests2/lib/libmp/Makefile.depend
  user/ngie/more-tests2/lib/libmt/Makefile.depend
  user/ngie/more-tests2/lib/libnetgraph/Makefile.depend
  user/ngie/more-tests2/lib/libngatm/Makefile.depend
  user/ngie/more-tests2/lib/libnv/Makefile.depend
  user/ngie/more-tests2/lib/libopie/Makefile.depend
  user/ngie/more-tests2/lib/libpam/libpam/Makefile.depend
  user/ngie/more-tests2/lib/libpcap/Makefile
  user/ngie/more-tests2/lib/libpcap/Makefile.depend
  user/ngie/more-tests2/lib/libpmc/Makefile.depend
  user/ngie/more-tests2/lib/libproc/Makefile
  user/ngie/more-tests2/lib/libproc/Makefile.depend
  user/ngie/more-tests2/lib/libprocstat/Makefile.depend
  user/ngie/more-tests2/lib/libradius/Makefile.depend
  user/ngie/more-tests2/lib/librpcsec_gss/Makefile.depend
  user/ngie/more-tests2/lib/librpcsvc/Makefile.depend
  user/ngie/more-tests2/lib/librt/Makefile.depend
  user/ngie/more-tests2/lib/librtld_db/Makefile
  user/ngie/more-tests2/lib/librtld_db/Makefile.depend
  user/ngie/more-tests2/lib/libsbuf/Makefile.depend
  user/ngie/more-tests2/lib/libsdp/Makefile.depend
  user/ngie/more-tests2/lib/libsm/Makefile
  user/ngie/more-tests2/lib/libsmb/Makefile.depend
  user/ngie/more-tests2/lib/libsmdb/Makefile
  user/ngie/more-tests2/lib/libsmutil/Makefile
  user/ngie/more-tests2/lib/libsqlite3/Makefile.depend
  user/ngie/more-tests2/lib/libstdbuf/Makefile.depend
  user/ngie/more-tests2/lib/libstdthreads/Makefile.depend
  user/ngie/more-tests2/lib/libthr/Makefile.depend
  user/ngie/more-tests2/lib/libthread_db/Makefile.depend
  user/ngie/more-tests2/lib/libucl/Makefile.depend
  user/ngie/more-tests2/lib/libufs/Makefile.depend
  user/ngie/more-tests2/lib/libugidfw/Makefile.depend
  user/ngie/more-tests2/lib/libulog/Makefile.depend
  user/ngie/more-tests2/lib/libunbound/Makefile.depend
  user/ngie/more-tests2/lib/libusb/Makefile.depend
  user/ngie/more-tests2/lib/libusbhid/Makefile.depend
  user/ngie/more-tests2/lib/libutil/Makefile.depend
  user/ngie/more-tests2/lib/libvgl/Makefile.depend
  user/ngie/more-tests2/lib/libvmmapi/Makefile.depend
  user/ngie/more-tests2/lib/libwrap/Makefile.depend
  user/ngie/more-tests2/lib/libxo/Makefile.depend
  user/ngie/more-tests2/lib/libypclnt/Makefile.depend
  user/ngie/more-tests2/lib/libz/Makefile.depend
  user/ngie/more-tests2/lib/msun/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/form/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/formw/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/menu/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/menuw/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/ncurses/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/ncursesw/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/panel/Makefile.depend
  user/ngie/more-tests2/lib/ncurses/panelw/Makefile.depend
  user/ngie/more-tests2/libexec/mail.local/Makefile
  user/ngie/more-tests2/libexec/smrsh/Makefile
  user/ngie/more-tests2/release/tools/arm.subr
  user/ngie/more-tests2/sbin/ipf/ipf/Makefile
  user/ngie/more-tests2/sbin/ipf/ipftest/Makefile
  user/ngie/more-tests2/sbin/ipf/ipmon/Makefile
  user/ngie/more-tests2/sbin/ipf/ipnat/Makefile
  user/ngie/more-tests2/sbin/ipf/ippool/Makefile
  user/ngie/more-tests2/secure/lib/libcrypto/Makefile.depend
  user/ngie/more-tests2/secure/lib/libssh/Makefile.depend
  user/ngie/more-tests2/secure/lib/libssl/Makefile.depend
  user/ngie/more-tests2/share/colldef/Makefile.depend
  user/ngie/more-tests2/share/man/man4/aue.4
  user/ngie/more-tests2/share/man/man4/axe.4
  user/ngie/more-tests2/share/man/man4/axge.4
  user/ngie/more-tests2/share/man/man4/cdce.4
  user/ngie/more-tests2/share/man/man4/cue.4
  user/ngie/more-tests2/share/man/man4/ipheth.4
  user/ngie/more-tests2/share/man/man4/kue.4
  user/ngie/more-tests2/share/man/man4/mos.4
  user/ngie/more-tests2/share/man/man4/rue.4
  user/ngie/more-tests2/share/man/man4/smsc.4
  user/ngie/more-tests2/share/man/man4/udav.4
  user/ngie/more-tests2/share/man/man4/urndis.4
  user/ngie/more-tests2/share/mk/bsd.libnames.mk
  user/ngie/more-tests2/share/mk/bsd.own.mk
  user/ngie/more-tests2/share/mk/bsd.progs.mk
  user/ngie/more-tests2/share/mk/local.dirdeps.mk
  user/ngie/more-tests2/share/mk/local.gendirdeps.mk
  user/ngie/more-tests2/share/mk/local.init.mk
  user/ngie/more-tests2/share/mk/local.meta.sys.mk
  user/ngie/more-tests2/share/mk/local.sys.mk
  user/ngie/more-tests2/share/mk/meta.autodep.mk
  user/ngie/more-tests2/share/mk/src.libnames.mk
  user/ngie/more-tests2/share/mk/sys.mk
  user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c
  user/ngie/more-tests2/sys/arm/include/sf_buf.h
  user/ngie/more-tests2/sys/arm64/arm64/pmap.c
  user/ngie/more-tests2/sys/arm64/include/vmparam.h
  user/ngie/more-tests2/sys/boot/i386/boot2/Makefile
  user/ngie/more-tests2/sys/conf/NOTES
  user/ngie/more-tests2/sys/conf/files
  user/ngie/more-tests2/sys/conf/newvers.sh
  user/ngie/more-tests2/sys/conf/options
  user/ngie/more-tests2/sys/dev/ath/if_ath_rx.c
  user/ngie/more-tests2/sys/dev/isp/isp.c
  user/ngie/more-tests2/sys/dev/isp/isp_target.c
  user/ngie/more-tests2/sys/dev/isp/ispmbox.h
  user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.c
  user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.h
  user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c
  user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnreg.h
  user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnvar.h
  user/ngie/more-tests2/sys/kern/kern_hhook.c
  user/ngie/more-tests2/sys/kern/vfs_subr.c
  user/ngie/more-tests2/sys/modules/Makefile
  user/ngie/more-tests2/sys/net/if.c
  user/ngie/more-tests2/sys/net/if_enc.c
  user/ngie/more-tests2/sys/net/if_enc.h
  user/ngie/more-tests2/sys/net/if_var.h
  user/ngie/more-tests2/sys/net80211/ieee80211_ht.c
  user/ngie/more-tests2/sys/netinet/in_pcb.c
  user/ngie/more-tests2/sys/netinet/ip_input.c
  user/ngie/more-tests2/sys/netinet6/ip6_input.c
  user/ngie/more-tests2/sys/netipsec/ipsec.c
  user/ngie/more-tests2/sys/netipsec/ipsec.h
  user/ngie/more-tests2/sys/netipsec/ipsec_input.c
  user/ngie/more-tests2/sys/netipsec/ipsec_output.c
  user/ngie/more-tests2/sys/ofed/include/rdma/ib_pma.h
  user/ngie/more-tests2/sys/powerpc/aim/slb.c
  user/ngie/more-tests2/sys/powerpc/include/atomic.h
  user/ngie/more-tests2/sys/sys/hhook.h
  user/ngie/more-tests2/sys/x86/x86/identcpu.c
  user/ngie/more-tests2/targets/pseudo/bootstrap-tools/Makefile
  user/ngie/more-tests2/targets/pseudo/hosttools/Makefile.depend
  user/ngie/more-tests2/targets/pseudo/stage/Makefile
  user/ngie/more-tests2/targets/pseudo/toolchain/Makefile.depend
  user/ngie/more-tests2/targets/pseudo/userland/share/Makefile.depend
  user/ngie/more-tests2/tests/sys/kern/acct/Makefile
  user/ngie/more-tests2/tools/tools/README
  user/ngie/more-tests2/usr.bin/awk/Makefile
  user/ngie/more-tests2/usr.bin/calendar/calendars/calendar.freebsd
  user/ngie/more-tests2/usr.bin/cpio/tests/Makefile
  user/ngie/more-tests2/usr.bin/kdump/Makefile
  user/ngie/more-tests2/usr.bin/netstat/Makefile
  user/ngie/more-tests2/usr.bin/netstat/inet.c
  user/ngie/more-tests2/usr.bin/netstat/main.c
  user/ngie/more-tests2/usr.bin/readelf/Makefile
  user/ngie/more-tests2/usr.bin/svn/svn/Makefile
  user/ngie/more-tests2/usr.bin/tar/tests/Makefile
  user/ngie/more-tests2/usr.bin/vacation/Makefile
  user/ngie/more-tests2/usr.sbin/acpi/iasl/Makefile
  user/ngie/more-tests2/usr.sbin/amd/include/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
  user/ngie/more-tests2/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
  user/ngie/more-tests2/usr.sbin/editmap/Makefile
  user/ngie/more-tests2/usr.sbin/mailstats/Makefile
  user/ngie/more-tests2/usr.sbin/makemap/Makefile
  user/ngie/more-tests2/usr.sbin/praliases/Makefile
  user/ngie/more-tests2/usr.sbin/sendmail/Makefile
  user/ngie/more-tests2/usr.sbin/syslogd/syslogd.c
Directory Properties:
  user/ngie/more-tests2/   (props changed)
  user/ngie/more-tests2/cddl/   (props changed)
  user/ngie/more-tests2/contrib/bmake/   (props changed)
  user/ngie/more-tests2/crypto/openssh/   (props changed)
  user/ngie/more-tests2/gnu/lib/   (props changed)
  user/ngie/more-tests2/gnu/usr.bin/binutils/   (props changed)
  user/ngie/more-tests2/gnu/usr.bin/cc/cc_tools/   (props changed)
  user/ngie/more-tests2/include/   (props changed)
  user/ngie/more-tests2/lib/libc/   (props changed)
  user/ngie/more-tests2/lib/libutil/   (props changed)
  user/ngie/more-tests2/lib/libvmmapi/   (props changed)
  user/ngie/more-tests2/lib/libz/   (props changed)
  user/ngie/more-tests2/sbin/   (props changed)
  user/ngie/more-tests2/share/   (props changed)
  user/ngie/more-tests2/share/man/man4/   (props changed)
  user/ngie/more-tests2/sys/   (props changed)
  user/ngie/more-tests2/sys/boot/   (props changed)
  user/ngie/more-tests2/sys/conf/   (props changed)
  user/ngie/more-tests2/targets/   (props changed)
  user/ngie/more-tests2/usr.bin/calendar/   (props changed)

Modified: user/ngie/more-tests2/bin/rmail/Makefile
==============================================================================
--- user/ngie/more-tests2/bin/rmail/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/bin/rmail/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -29,7 +29,7 @@ LDFLAGS+=${SENDMAIL_LDFLAGS}
 # following:
 # CFLAGS+= -DQUEUE_ONLY
 
-sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 .include <bsd.prog.mk>

Modified: user/ngie/more-tests2/bin/sh/mknodes.c
==============================================================================
--- user/ngie/more-tests2/bin/sh/mknodes.c	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/bin/sh/mknodes.c	Thu Nov 26 01:05:54 2015	(r291346)
@@ -296,10 +296,10 @@ outfunc(FILE *cfile, int calcsize)
 	else
 		fputs("	    return NULL;\n", cfile);
 	if (calcsize)
-		fputs("      funcblocksize += nodesize[n->type];\n", cfile);
+		fputs("      result->blocksize += nodesize[n->type];\n", cfile);
 	else {
-		fputs("      new = funcblock;\n", cfile);
-		fputs("      funcblock = (char *)funcblock + nodesize[n->type];\n", cfile);
+		fputs("      new = state->block;\n", cfile);
+		fputs("      state->block = (char *)state->block + nodesize[n->type];\n", cfile);
 	}
 	fputs("      switch (n->type) {\n", cfile);
 	for (sp = str ; sp < &str[nstr] ; sp++) {
@@ -313,33 +313,33 @@ outfunc(FILE *cfile, int calcsize)
 			case T_NODE:
 				if (calcsize) {
 					indent(12, cfile);
-					fprintf(cfile, "calcsize(n->%s.%s);\n",
+					fprintf(cfile, "calcsize(n->%s.%s, result);\n",
 						sp->tag, fp->name);
 				} else {
 					indent(12, cfile);
-					fprintf(cfile, "new->%s.%s = copynode(n->%s.%s);\n",
+					fprintf(cfile, "new->%s.%s = copynode(n->%s.%s, state);\n",
 						sp->tag, fp->name, sp->tag, fp->name);
 				}
 				break;
 			case T_NODELIST:
 				if (calcsize) {
 					indent(12, cfile);
-					fprintf(cfile, "sizenodelist(n->%s.%s);\n",
+					fprintf(cfile, "sizenodelist(n->%s.%s, result);\n",
 						sp->tag, fp->name);
 				} else {
 					indent(12, cfile);
-					fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s);\n",
+					fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s, state);\n",
 						sp->tag, fp->name, sp->tag, fp->name);
 				}
 				break;
 			case T_STRING:
 				if (calcsize) {
 					indent(12, cfile);
-					fprintf(cfile, "funcstringsize += strlen(n->%s.%s) + 1;\n",
+					fprintf(cfile, "result->stringsize += strlen(n->%s.%s) + 1;\n",
 						sp->tag, fp->name);
 				} else {
 					indent(12, cfile);
-					fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s);\n",
+					fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s, state);\n",
 						sp->tag, fp->name, sp->tag, fp->name);
 				}
 				break;

Modified: user/ngie/more-tests2/bin/sh/nodes.c.pat
==============================================================================
--- user/ngie/more-tests2/bin/sh/nodes.c.pat	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/bin/sh/nodes.c.pat	Thu Nov 26 01:05:54 2015	(r291346)
@@ -46,19 +46,24 @@
 #include "mystring.h"
 
 
-static int     funcblocksize;	/* size of structures in function */
-static int     funcstringsize;	/* size of strings in node */
-static pointer funcblock;	/* block to allocate function from */
-static char   *funcstring;	/* block to allocate strings from */
+struct nodesize {
+	int     blocksize;	/* size of structures in function */
+	int     stringsize;	/* size of strings in node */
+};
+
+struct nodecopystate {
+	pointer block;		/* block to allocate function from */
+	char   *string;		/* block to allocate strings from */
+};
 
 %SIZES
 
 
-static void calcsize(union node *);
-static void sizenodelist(struct nodelist *);
-static union node *copynode(union node *);
-static struct nodelist *copynodelist(struct nodelist *);
-static char *nodesavestr(const char *);
+static void calcsize(union node *, struct nodesize *);
+static void sizenodelist(struct nodelist *, struct nodesize *);
+static union node *copynode(union node *, struct nodecopystate *);
+static struct nodelist *copynodelist(struct nodelist *, struct nodecopystate *);
+static char *nodesavestr(const char *, struct nodecopystate *);
 
 
 struct funcdef {
@@ -73,18 +78,20 @@ struct funcdef {
 struct funcdef *
 copyfunc(union node *n)
 {
+	struct nodesize sz;
+	struct nodecopystate st;
 	struct funcdef *fn;
 
 	if (n == NULL)
 		return NULL;
-	funcblocksize = offsetof(struct funcdef, n);
-	funcstringsize = 0;
-	calcsize(n);
-	fn = ckmalloc(funcblocksize + funcstringsize);
+	sz.blocksize = offsetof(struct funcdef, n);
+	sz.stringsize = 0;
+	calcsize(n, &sz);
+	fn = ckmalloc(sz.blocksize + sz.stringsize);
 	fn->refcount = 1;
-	funcblock = (char *)fn + offsetof(struct funcdef, n);
-	funcstring = (char *)fn + funcblocksize;
-	copynode(n);
+	st.block = (char *)fn + offsetof(struct funcdef, n);
+	st.string = (char *)fn + sz.blocksize;
+	copynode(n, &st);
 	return fn;
 }
 
@@ -97,7 +104,7 @@ getfuncnode(struct funcdef *fn)
 
 
 static void
-calcsize(union node *n)
+calcsize(union node *n, struct nodesize *result)
 {
 	%CALCSIZE
 }
@@ -105,11 +112,11 @@ calcsize(union node *n)
 
 
 static void
-sizenodelist(struct nodelist *lp)
+sizenodelist(struct nodelist *lp, struct nodesize *result)
 {
 	while (lp) {
-		funcblocksize += ALIGN(sizeof(struct nodelist));
-		calcsize(lp->n);
+		result->blocksize += ALIGN(sizeof(struct nodelist));
+		calcsize(lp->n, result);
 		lp = lp->next;
 	}
 }
@@ -117,7 +124,7 @@ sizenodelist(struct nodelist *lp)
 
 
 static union node *
-copynode(union node *n)
+copynode(union node *n, struct nodecopystate *state)
 {
 	union node *new;
 
@@ -127,16 +134,17 @@ copynode(union node *n)
 
 
 static struct nodelist *
-copynodelist(struct nodelist *lp)
+copynodelist(struct nodelist *lp, struct nodecopystate *state)
 {
 	struct nodelist *start;
 	struct nodelist **lpp;
 
 	lpp = &start;
 	while (lp) {
-		*lpp = funcblock;
-		funcblock = (char *)funcblock + ALIGN(sizeof(struct nodelist));
-		(*lpp)->n = copynode(lp->n);
+		*lpp = state->block;
+		state->block = (char *)state->block +
+		    ALIGN(sizeof(struct nodelist));
+		(*lpp)->n = copynode(lp->n, state);
 		lp = lp->next;
 		lpp = &(*lpp)->next;
 	}
@@ -147,15 +155,15 @@ copynodelist(struct nodelist *lp)
 
 
 static char *
-nodesavestr(const char *s)
+nodesavestr(const char *s, struct nodecopystate *state)
 {
 	const char *p = s;
-	char *q = funcstring;
-	char   *rtn = funcstring;
+	char *q = state->string;
+	char   *rtn = state->string;
 
 	while ((*q++ = *p++) != '\0')
 		continue;
-	funcstring = q;
+	state->string = q;
 	return rtn;
 }
 

Modified: user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libavl/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libctf/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libelf \
 	lib/libz \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libdtrace/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -15,7 +15,6 @@ DIRDEPS = \
 	lib/libproc \
 	lib/librtld_db \
 	lib/libthr \
-	usr.bin/xinstall.host \
 	usr.bin/yacc.host \
 
 

Modified: user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libnvpair/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -10,7 +10,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/msun \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libumem/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libuutil/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libzfs/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -20,7 +20,6 @@ DIRDEPS = \
 	lib/libthr \
 	lib/libutil \
 	lib/msun \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libzfs_core/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/msun \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend
==============================================================================
--- user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/lib/libzpool/Makefile.depend	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,7 +16,6 @@ DIRDEPS = \
 	lib/libthr \
 	lib/libz \
 	lib/msun \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -186,4 +186,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -26,4 +26,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/begin/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -19,4 +19,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -34,4 +34,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -45,4 +45,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cg/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -15,4 +15,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -24,4 +24,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/decls/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/drops/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -21,4 +21,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -115,4 +115,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/end/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/enum/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/error/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/exit/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -110,4 +110,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -17,4 +17,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/include/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/inline/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -25,4 +25,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/io/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -15,4 +15,4 @@ CFILES= \
      tst.fds.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ip/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -33,4 +33,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -41,4 +41,4 @@ CFILES= \
      tst.ProbeData.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/json/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -20,4 +20,4 @@ CFILES= \
      tst.usdt.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -47,4 +47,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/mib/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/misc/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -31,4 +31,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
      tst.call3.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -25,4 +25,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/operators/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -15,4 +15,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pid/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -66,4 +66,4 @@ CFILES= \
      tst.weak2.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -45,4 +45,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -27,4 +27,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -22,4 +22,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -50,4 +50,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/print/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -29,4 +29,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printa/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -37,4 +37,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/printf/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -65,4 +65,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/privs/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -21,4 +21,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/probes/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -33,4 +33,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -27,4 +27,4 @@ CFILES= \
 LDADD.tst.sigwait.exe+= -lrt
 DPADD.tst.sigwait.exe+= ${LIBRT}
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -50,4 +50,4 @@ CFILES= \
      tst.ufuncsort.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/providers/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -41,4 +41,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/raise/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -18,4 +18,4 @@ CFILES= \
      tst.raise3.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/rates/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/safety/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -51,4 +51,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -34,4 +34,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sched/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -46,4 +46,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
      tst.sdtargs.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -28,4 +28,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -72,4 +72,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stability/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stack/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -19,4 +19,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/stop/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
      tst.stop2.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -17,4 +17,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/struct/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -28,4 +28,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -15,4 +15,4 @@ CFILES= \
      tst.args.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -16,4 +16,4 @@ CFILES= \
      tst.post_chan.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -35,4 +35,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/trace/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -21,4 +21,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -23,4 +23,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/translators/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -48,4 +48,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -18,4 +18,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/types/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -66,4 +66,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -38,4 +38,4 @@ CFILES= \
 
 WITH_CTF=YES
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/union/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -24,4 +24,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -62,4 +62,4 @@ CFILES= \
      tst.forker.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -17,4 +17,4 @@ CFILES= \
      tst.spin.c  \
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/vars/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -20,4 +20,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/version/Makefile	Thu Nov 26 01:05:54 2015	(r291346)
@@ -14,4 +14,4 @@ CFILES= \
 
 
 
-.include "../../Makefile.inc1"
+.include "../../dtrace.test.mk"

Copied: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (from r291345, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/dtrace.test.mk	Thu Nov 26 01:05:54 2015	(r291346, copy of r291345, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk)
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T}
+TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
+TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP}
+
+FILESGROUPS+=	FILES ${TESTGROUP} ${TESTGROUP}EXE
+
+${TESTGROUP}= ${TESTFILES}
+${TESTGROUP}EXE= ${TESTEXES}
+${TESTGROUP}EXEMODE= 0555
+
+TESTWRAPPER=	t_dtrace_contrib
+ATF_TESTS_SH+=	${TESTWRAPPER}
+TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh"
+TEST_METADATA.t_dtrace_contrib+= required_user="root"
+
+GENTEST?=	${.CURDIR:H:H}/tools/gentest.sh
+EXCLUDE=	${.CURDIR:H:H}/tools/exclude.sh
+${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}}
+	sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
+
+CLEANFILES+=	${TESTWRAPPER}.sh
+
+.PATH:	${TESTSRC}
+
+PROGS=		${CFILES:T:S/.c$/.exe/g}
+.for prog in ${PROGS}
+SRCS.${prog}+= ${prog:S/.exe$/.c/}
+
+.if exists(${prog:S/^tst.//:S/.exe$/.d/})
+SRCS.${prog}+=	${prog:S/^tst.//:S/.exe$/.d/}
+.endif
+.endfor
+
+BINDIR=		${TESTSDIR}
+MAN=
+
+# Some tests depend on the internals of their corresponding test programs,
+# so make sure the optimizer doesn't interfere with them.
+CFLAGS+=	-O0
+
+# Test programs shouldn't be stripped; else we generally can't use the PID
+# provider.
+DEBUG_FLAGS=	-g
+STRIP=
+
+.include <bsd.test.mk>

Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Thu Nov 26 00:56:07 2015	(r291345)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Thu Nov 26 01:05:54 2015	(r291346)
@@ -63,7 +63,7 @@ CFILES= \\
 $tcfiles

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511260105.tAQ15sYm099540>