aboutsummaryrefslogtreecommitdiff
path: root/cddl/usr.sbin/dtrace
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/usr.sbin/dtrace')
-rw-r--r--cddl/usr.sbin/dtrace/Makefile9
-rw-r--r--cddl/usr.sbin/dtrace/Makefile.depend9
-rw-r--r--cddl/usr.sbin/dtrace/tests/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/amd64/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/aggs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/arrays/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/assocs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/begin/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/buffering/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/cg/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/clauses/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/cpc/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/decls/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/drops/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/end/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/enum/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/env/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/error/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/exit/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/funcs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/grammar/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/include/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/inline/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/io/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/ip/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/java_api/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/json/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/kinst/Makefile17
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/lexer/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/mdb/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/mib/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/misc/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/nfs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/oformat/Makefile42
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/operators/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pid/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pointers/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pragma/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/predicates/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/print/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/printa/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/printf/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/privs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/probes/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/proc/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/providers/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/raise/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/rates/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/safety/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/scalars/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sched/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/scripting/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sdt/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/speculation/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stability/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stack/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stop/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/strlen/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/struct/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sugar/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/syscall/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/trace/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/translators/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/typedef/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/types/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/uctf/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/union/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/usdt/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/ustack/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/vars/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/version/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend1
-rw-r--r--cddl/usr.sbin/dtrace/tests/dtrace.test.mk3
-rw-r--r--cddl/usr.sbin/dtrace/tests/i386/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/i386/pid/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile2
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/dtest.sh12
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/exclude.sh1
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh3
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/gentest.sh1
183 files changed, 78 insertions, 289 deletions
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index d8510e62fb29..c72b55cc4903 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
.include <src.opts.mk>
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace
@@ -30,7 +28,12 @@ CFLAGS+= -DHAVE_ISSETUGID
#CFLAGS+= -DNEED_ERRLOC
#YFLAGS+= -d
-LIBADD= dtrace ctf elf proc spl
+.if ${MK_DTRACE_ASAN} != "no"
+CFLAGS+= -fsanitize=address -fsanitize=undefined
+LDFLAGS+= -fsanitize=address -fsanitize=undefined
+.endif
+
+LIBADD= dtrace ctf elf proc spl xo
.if ${MK_DTRACE_TESTS} != "no"
SUBDIR+= tests
diff --git a/cddl/usr.sbin/dtrace/Makefile.depend b/cddl/usr.sbin/dtrace/Makefile.depend
index c37ef4acf01e..244baabbff3d 100644
--- a/cddl/usr.sbin/dtrace/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/Makefile.depend
@@ -1,24 +1,17 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libctf \
cddl/lib/libdtrace \
- gnu/lib/csu \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libcxxrt \
lib/libelf \
- lib/libkvm \
lib/libproc \
- lib/libprocstat \
lib/librtld_db \
- lib/libthr \
- lib/libutil \
- lib/libz \
.include <dirdeps.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile
index a311126f38b5..7aa8600bf702 100644
--- a/cddl/usr.sbin/dtrace/tests/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
.include <bsd.own.mk>
TESTS_SUBDIRS+= common
diff --git a/cddl/usr.sbin/dtrace/tests/Makefile.depend b/cddl/usr.sbin/dtrace/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
index 39ccd333bedf..100a66fa744c 100644
--- a/cddl/usr.sbin/dtrace/tests/amd64/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/amd64
TESTS_SUBDIRS+= arrays
diff --git a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
index 0308ba5083e1..d06cfb032f58 100644
--- a/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile b/cddl/usr.sbin/dtrace/tests/common/Makefile
index c395269e7aa9..a7c3aac9c6f5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
# We exclude several subdirectories: nfs and sysevent do not compile on
# FreeBSD, and docsExamples doesn't seem amenable to automated testing.
@@ -32,6 +30,7 @@ TESTS_SUBDIRS+= aggs \
ip \
java_api \
json \
+ kinst \
lexer \
llquantize \
mdb \
@@ -39,6 +38,7 @@ TESTS_SUBDIRS+= aggs \
misc \
multiaggs \
offsetof \
+ oformat \
operators \
pid \
plockstat \
diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
index b5e95bc8fd67..2ab9c05e2f80 100644
--- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
index 2abee2f8598e..e7b8177f51f9 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
index abbc48322795..04f64f07221c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
index d7e64b8e4501..faee92dcfe00 100644
--- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
index 1c254bfe2958..733f2f73fa19 100644
--- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
index 903e19262f73..dc3637c7fd07 100644
--- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
index e9680e57088c..f5e2f40cb1a8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
index 962e8c9bddb8..a22dd3ea6d05 100644
--- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
index e98af5191aea..68baf9acd33b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
index 0e835239c35d..f72aa480efba 100644
--- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
index 7b8e85d904e7..ec489bb094b6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
index bd3bf7716feb..6b8fb677d8a6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
index 5ca7d0908fd7..1dae1ddb11b4 100644
--- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
index 4f1973c69b26..87ed77eb0c2d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
index dc77d8f0bc04..9371ab837a40 100644
--- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
index a05361ec4a39..957a2290d250 100644
--- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
index 9b78801d4c2f..b83f0251799b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/env/Makefile b/cddl/usr.sbin/dtrace/tests/common/env/Makefile
index 9c37c28b448b..0d7ee4b975dd 100644
--- a/cddl/usr.sbin/dtrace/tests/common/env/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/env/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
index afd93dd222ee..7bf4f38b63bf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
index 3732caa83335..d58baea479c5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
index c773b78ba795..0dee8f807065 100644
--- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
@@ -8,6 +6,8 @@ PACKAGE= tests
${PACKAGE}FILES= \
err.D_PDESC_ZERO.notreturn.d \
+ tst.argtest.ksh \
+ tst.argtest.ksh.out \
tst.basic.d \
tst.functionentry.d \
tst.functionreturnvalue.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
index 67d0b3cc4928..52bd1fc67ba7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
index b9b94f2c6b35..42cad7c69357 100644
--- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
index d84f25bef30d..5e8a18816dfa 100644
--- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
index 3a30b97d3cb6..f21a46a7b41a 100644
--- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
index 9075358230c4..e8af41d187da 100644
--- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
index 25a214b7f37b..e005b43d064d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
index 7c7fdef9c008..e902c1bc4562 100644
--- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
index 24400027c1e4..e3a0020149c2 100644
--- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
new file mode 100644
index 000000000000..c683a5ce0700
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/common/kinst/Makefile
@@ -0,0 +1,17 @@
+#
+# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
+#
+
+PACKAGE= tests
+
+${PACKAGE}FILES= \
+ tst.basic.ksh \
+
+TESTEXES= \
+
+
+CFILES= \
+
+
+
+.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
index d53872a0361b..8b7ec52c7f1f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
index ed99dd1e116f..e4bb476f0df7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
index 26c26e7ba558..be8f66af0193 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
index ed799e68a879..b6d335b03f7e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
index 87084ab5d593..bc96403cfe22 100644
--- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
index 2c0c4263a909..16bb602627bb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
index b50285991374..81af106bce7d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
index 2f56b12a035c..856f58d0afbd 100644
--- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile b/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
new file mode 100644
index 000000000000..219833285d0c
--- /dev/null
+++ b/cddl/usr.sbin/dtrace/tests/common/oformat/Makefile
@@ -0,0 +1,42 @@
+#
+# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
+#
+
+PACKAGE= tests
+
+${PACKAGE}FILES= \
+ tst.agg.avg.ksh \
+ tst.agg.count.ksh \
+ tst.agg.llquantize.ksh \
+ tst.agg.lquantize.ksh \
+ tst.agg.max.ksh \
+ tst.agg.min.ksh \
+ tst.agg.quantize.ksh \
+ tst.agg.stddev.ksh \
+ tst.agg.sum.ksh \
+ tst.aggmod.ksh \
+ tst.aggstack.ksh \
+ tst.aggsym.ksh \
+ tst.aggustack.ksh \
+ tst.aggusym.ksh \
+ tst.drop.ksh \
+ tst.mod.ksh \
+ tst.print.ksh \
+ tst.printf.ksh \
+ tst.printm.ksh \
+ tst.stack.ksh \
+ tst.sym.ksh \
+ tst.trace.ksh \
+ tst.tracemem.ksh \
+ tst.umod.ksh \
+ tst.ustack.ksh \
+ tst.usym.ksh \
+
+TESTEXES= \
+
+
+CFILES= \
+
+
+
+.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
index daf530b93b62..6586e026fa0e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
index 0b9fdeb8bb6e..70fc2f3f34e6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
index 57e30ed99036..bf927d104601 100644
--- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
index af438aaaac2c..cfd83844f53c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
index 26b6920d0b0c..008bbeb50dcf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
index bd14b43757f6..9de4716fdad8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
index f8b8917be205..a32410bab1c8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
index af4e20e30557..e072128c6b44 100644
--- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
index 8f5ac3613dcb..490a1976abe6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
index 86cfdbbd5d9b..1e4e418adbd2 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
index 36f6106f8f96..7c06b13489e5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
index 7e02b9a73900..9bc11ba16362 100644
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
index 296634da3e38..6009b0dddd07 100644
--- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend
index 564eb51e0156..ab828d5334d8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
index 4e5a0157ecff..84f4706b61ee 100644
--- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend
index 03d33794d0e3..af9acf31579d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
index 3972831ba5d5..e1c38944e3ff 100644
--- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
index 83af0e40de1f..61de9b115cc1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
index bc9ab0a9d446..7cce698dd37c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
index 51b302fd3ad7..5d7bd3b0dd77 100644
--- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
index 9f019068da35..a1942e1653cd 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
index d1bf42553346..abd2a4bdc904 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
index 1562629423ea..d46b1bb12546 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
index ad0a43e4047e..fca9f42ddd97 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
index 021d0099b213..72238f2b1436 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
index 5afee0225e89..f39f9772bcc9 100644
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
index 826202d4de3f..5becc2451938 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
index 2fc1e8164dc6..413bc56f57d8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
index e7beb43fa827..2cbdc34d5c35 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
index 50a44bbd0a98..eb55979f3449 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
index 19937d3055eb..ff61302bf8a5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
index 0ccc037d8bf3..80a6fd17082e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
index 35dd51a8067c..93c2a1cd94c0 100644
--- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
index 40fc86a45ce0..595c05b85fce 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
index f759b6bd398f..e0d8f4d85ec0 100644
--- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
index d87b2bbaf042..980d8a587a08 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
index 1800635351d7..455782bfc823 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
index 19ff8e44230b..182e460410a5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
index 29b0ea26e691..accb6959b775 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
index 6d38d1d63e36..f0f8f4db8970 100644
--- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
index d3edcfd071ed..100538f4b867 100644
--- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
index 89c2947f2632..e4a7a2b1479d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
index 945a853b69df..4847feccc770 100644
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
index 855869f05f04..e11f4831e7d9 100644
--- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
index dd5571980d1d..8717fc68173c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
index 6ea0621a0c29..68a690df76aa 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend
index cae7e645ef6a..d80b3a4991d1 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
index bced0bf6da53..db7f4df5e405 100644
--- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
index 3f1589f4249c..c472ecec588c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend b/cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
index 0da134c0cbc2..54e2aec68dcc 100644
--- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
+++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
@@ -1,4 +1,3 @@
-# $FreeBSD$
TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T}
TESTBASE= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst
@@ -13,7 +12,7 @@ ${TESTGROUP}EXEPACKAGE= ${PACKAGE}
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_programs="ksh jq perl xmllint"
TEST_METADATA.t_dtrace_contrib+= required_user="root"
GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh
diff --git a/cddl/usr.sbin/dtrace/tests/i386/Makefile b/cddl/usr.sbin/dtrace/tests/i386/Makefile
index bd6f7cf5ad5c..4150a33adde9 100644
--- a/cddl/usr.sbin/dtrace/tests/i386/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/i386
TESTS_SUBDIRS+= arrays \
funcs \
diff --git a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
index e97c9c64fbba..d6025751a877 100644
--- a/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
index 64a00fa57d8b..1d8fed1849ac 100644
--- a/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
index 61fb328cbc7b..fac69dae8306 100644
--- a/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/pid/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
index bc7c6a2d34c0..e1d274cb17a8 100644
--- a/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
#
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
index dc1f0244739c..a6634bea43a6 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
@@ -1,7 +1,5 @@
#!/bin/sh
-# $FreeBSD$
-
usage()
{
cat >&2 <<__EOF__
@@ -72,7 +70,7 @@ runtest()
err.*.ksh|tst.*.ksh)
expr "$TFILE" : 'err.*' >/dev/null && exstatus=1
- tst=$TFILE ksh "$TFILE" /usr/sbin/dtrace >$STDOUT 2>$STDERR
+ tst=$TFILE ksh -p "$TFILE" /usr/sbin/dtrace >$STDOUT 2>$STDERR
status=$?
if [ $status -ne $exstatus ]; then
@@ -88,7 +86,7 @@ runtest()
if [ $retval -eq 0 ] && \
head -n 1 $STDOUT | grep -q -E '^#!/.*ksh$'; then
- ksh $STDOUT
+ ksh -p $STDOUT
retval=$?
fi
@@ -102,7 +100,7 @@ readonly STDOUT=$(mktemp)
readonly TFILE=$(basename $1)
readonly EXOUT=${TFILE}.out
-kldstat -q -m dtrace_test || kldload dtrace_test
+kldload -n dtrace_test
cd $(dirname $1)
runtest
RESULT=$?
@@ -121,6 +119,10 @@ test stdout:
--
$(cat $STDOUT)
--
+test stdout diff:
+--
+$(diff -u $EXOUT $STDOUT)
+--
__EOF__
fi
if [ $(stat -f '%z' $STDERR) -gt 0 ]; then
diff --git a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
index 26e875073edd..dce5a843b605 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
# This file lists DTrace tests which are known to fail or hang/crash the
# system. They were pulled from the legacy DTrace test infrastructure in
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
index 4f756f7eaf3a..b3663a91d9ef 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
usage()
{
@@ -60,8 +59,6 @@ WITH_CTF=YES
local makefile=$(mktemp)
cat <<__EOF__ > $makefile
-# \$FreeBSD$
-
#
# This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
#
diff --git a/cddl/usr.sbin/dtrace/tests/tools/gentest.sh b/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
index 6bad066e5419..5d8912ac29b0 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/gentest.sh
@@ -1,4 +1,3 @@
-# $FreeBSD$
usage()
{