From nobody Sat Jun 1 15:18:17 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 4Vs3XT4Lt4z5N34T; Sat, 01 Jun 2024 15:18:17 +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 4Vs3XT1fHvz4LfX; Sat, 1 Jun 2024 15:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717255097; 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=F5MSa33vxGWjRtD4Qh3zJglC5MUDtCr1HrsORntVZS4=; b=S3FUoj8XZk+k/VsHdq35XdJVrEsV11jkT4kZOrWRN9CjxiX0I8qTPFrzg5aceJkKGVX8iC a3X7fPlIc91QNC6bU+xUzI9JblB/6FihAAhXMNzkBuIEaosIDrkuynjAUCSbIArcqngTf6 jwOY7tCsGVFStypSdZjGYo7KhZq6OnBgWWwy/74KO+xff20vk7XYEegxF3SIvOj2KwWYGu XPHYzKUzTPf8aygOFfxtD29LaWwR2yBac/zC8aAymD2sf8VqUTcNTNArm1OpXWge0Pf7av vpZSRXXkS2SzH1JVydxqCbbzEnDCAwEfSe27xj92RoV3DER6AhmteFhFkdpnTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717255097; a=rsa-sha256; cv=none; b=hXHlv1squxiDdqgl1v7EXA5HqBhIOUj02cQ/RDeZ2RyWFyX6YAjAIq4DueWcIC5Uvrrw7V eI+rdnfw1vcip4Dj9MzqZLmNyTKFcVQc6q0jxvjpbG627g5VQE4hfM7okGuQ5pkJuWwKyM Ulah0PjIMivpuCWh4YJ2+0uZpcZTuyiS6UjK+5IP6rz8rKb3gqi79U7hsahdBIAI/Ay+Kr FiVtykX4RvxDxf0kB0vvxW194IlvphpZA9f1qHfsOvNbzVUT57YyE7L3sMK0lAO+V+5Ksj MG8nxnEWYEvdDiqiA6jyCJE8zKoESAJCxzHQrn085Fk+E6W5zwcMsMkvR66QIA== 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=1717255097; 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=F5MSa33vxGWjRtD4Qh3zJglC5MUDtCr1HrsORntVZS4=; b=oyXn14eNHF+RXqN1pB5xmg9YpkCF602XkmimPAtdF+BstLI5spv8jmp5oE0BbeIapgBaG5 11X0Z9ly4fqh8Ea+VY6GNjrj1DM0h8s4+XbKbXsEBQDYITHf6w3r1W7XvLxhnYmxh3lt5X UnLaxYGej5flhu41CIfiMeCiZWX5f9E0QLn3YhXujeG60teIsXTMfNT3aLheqFp1YkMJlX 7sLnPRW2TdWUwaSqXslD9Qs0Szk3MYxRUqQJ07lZS73ex3ft2g9vldcVVRkfArssKnDdA0 HH/Pq8AqA1/TOw0Tey+eoed+TfhbA3xPZHY9zI7Yy9LGT2sxYao4T55F4Xpk1Q== 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 4Vs3XT0z7Jz1C20; Sat, 1 Jun 2024 15:18:17 +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 451FIHDK063118; Sat, 1 Jun 2024 15:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 451FIHkr063115; Sat, 1 Jun 2024 15:18:17 GMT (envelope-from git) Date: Sat, 1 Jun 2024 15:18:17 GMT Message-Id: <202406011518.451FIHkr063115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cb6b5e8ab9cf - main - 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/main X-Git-Reftype: branch X-Git-Commit: cb6b5e8ab9cfe3938855826fa3de0f58dacd364e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cb6b5e8ab9cfe3938855826fa3de0f58dacd364e commit cb6b5e8ab9cfe3938855826fa3de0f58dacd364e Author: Mark Johnston AuthorDate: 2024-06-01 15:16:33 +0000 Commit: Mark Johnston CommitDate: 2024-06-01 15:16:33 +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 --- 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=$?