From cb6b5e8ab9cfe3938855826fa3de0f58dacd364e Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Sat, 1 Jun 2024 11:16:33 -0400 Subject: [PATCH] dtrace tests: Fix loading of the test kernel module The old way is racy and can cause two instances, running in parallel, to attempt to load dtrace_test, and only one will succeed. This caused errors when running dtrace tests in parallel. MFC after: 1 week --- cddl/usr.sbin/dtrace/tests/tools/dtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh index d2f3dc4ed8d..a6634bea43a 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/dtest.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/dtest.sh @@ -100,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=$?