aboutsummaryrefslogtreecommitdiff
path: root/cddl/usr.sbin/dtrace/tests/tools/dtest.sh
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/usr.sbin/dtrace/tests/tools/dtest.sh')
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/dtest.sh12
1 files changed, 7 insertions, 5 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