4 files changed, 7 insertions, 10 deletions
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()
 {