From nobody Sun Jun 09 14:12:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vxxhh00gdz5MCN9; Sun, 09 Jun 2024 14:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vxxhg33p1z4DZD; Sun, 9 Jun 2024 14:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iIDGWg1cQpvLv/P7E2wQR0q7j1wZFCGWW/27aCVGpPY=; b=UB6J/2WG+gFP/oq06bzgz/IcLSxuvOlwrmui0HL/jpOlx9Zs6n2Dgg75Vek3jLqzevkzac Q7uHo3XSE66nl5mmH04Y6oLwJ1FIemNOdYg5uxtW9eC408TaM5NvpesWa/GqFnbT7xMFQz jog1Q5D1SN1ETwoV2IEUFlVwiKQFuY+TmLbqwrJ/z++U0AEFqwEOLTO6kpdAVL6wZqcy25 aCCEaw83VmdQXhfgaCLPH3nNdMRaMQS4XZWkGCgNY8tnaiDynIkwZxmb+PEWEj+xzwgmrl uTBhvKnkovmMVC6D6JFaXKYxKMZ0/h3K5K8PR5xDwqx4y4wF3udh+kgb6abELg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942339; a=rsa-sha256; cv=none; b=Zx3oOBGK4araRzF3PSA7ZXIEQgd7aXT/I0HyZXU6aUx2Xk6NiiPX7vFkjUKvPsofkPNQT2 8HDY9Lh7Qx9KRhDybmvGBVkXSoUo7k/BgNJ5m7Pyq2mhvYo/eSZLtze7XPzuq5jcm+HpdH Ax/ruLVQ0IKEtBKPsKlUwLVoFxr3tyipcp9RqcbARIFzykJjDzPXhXkzfX9aTvkqwWKBOi 5PUf0qtGx5Il3tEfPmKGI2bIda2I04a9WoAYxVbWresHLghFl6p3FWsRTWKZ8nZO0QlnwY lpDgsgWgs87XK1lNhAKX6fOoc7Chys8Hu46REJf8mjK7iffzvKjmeiepS1wOrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iIDGWg1cQpvLv/P7E2wQR0q7j1wZFCGWW/27aCVGpPY=; b=YqTewTfI3Zx5+KQ4PFicGezn/+b8NsbLcE8RHyZlF2I0fq9w2zxH9mxfIQxmsscAVch6gA CGzYuv1sgrLG4qv3m0M/LzmteWwqteQxCmydOrAQzA/flyV5qJR97Er2GeL1gWBLUcFYWk oX2hxBo63YI2VLzh7IPy2elifAxwXarF8e56ZhDUVng4vC5IbXN5TEZVglA82nT1sgjiI4 ZURvF9Ni9tvwIxxaVNsU2kECIyWejXaH3/JLDCU37WVnFMC3FE9p4bNsJftnf3jfLNmgns vD3v1vHMdP5XO68HMqlgB2uN1epnSNVOZ1nj2MyHbpMZG+n20VxXryY1RGl/TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vxxhf2VJZzlXK; Sun, 9 Jun 2024 14:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 459ECIjT086107; Sun, 9 Jun 2024 14:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459ECIhu086104; Sun, 9 Jun 2024 14:12:18 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:18 GMT Message-Id: <202406091412.459ECIhu086104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: aab8a370cc8b - stable/14 - dtrace tests: Fix loading of the test kernel module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aab8a370cc8bf41df673ba80b14f542364071288 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aab8a370cc8bf41df673ba80b14f542364071288 commit aab8a370cc8bf41df673ba80b14f542364071288 Author: Mark Johnston AuthorDate: 2024-06-01 15:16:33 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:48:06 +0000 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 (cherry picked from commit cb6b5e8ab9cfe3938855826fa3de0f58dacd364e) --- 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 d2f3dc4ed8df..a6634bea43a6 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=$?