From nobody Tue Sep 22 02:31:41 2026 X-Original-To: dev-commits-src-main@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 4hpkcs2LDRz6ssDc for ; Tue, 22 Sep 2026 02:31:41 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hpkcs1p1jz4bJL for ; Tue, 22 Sep 2026 02:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790044301; 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=tuJTl+6Uta/imFXsEfQGSDMAN9fgdFw+yVldVECN0ys=; b=iJluccm4u0OFo2UCyPSXmt/wxdmtkPzB5D8gDnoQrVMmgAEX9ge4nAMxv3w+B8aHW14jEd rLM5TUP6IRL3b8zo/fPTkEUsoygQDoVY651Qj9BrUL3RI1qWVmvIw47q4zYvpMx2H77YkV 6JBh1R92/B6jffe5vIR6uWTHjh1hPxrD6pDeaEpGKR94rQjlKFRRmk6NuJowdb2zGtXy/7 FxjH75hdXbzeZa3nXGADtrnedReelfiTS1BvBK+tO3/LCI4GHAEcoICjqXvDKVKK+7RMVz yIP8Xt7cNzGFMB4Qwi7hvt8mcQOPrp0WV1Kcqxy9Qx31nOVWPf71+d5Fdfjf6Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790044301; b=yowjkOZExam5Sz97Sto18P+VL789uft715vUKGK4QehPyXj+nQ7QKyW/ha288XA9YZs8DD CRt6VBFkpFb4Uy35G2oRnVOpMCPtKteXQmCNZTp1qtyB9uoguM2BAfijIM1qUiiauamBSi S0Ls1hJ6rjOoI6YnC00MudtqxSyG8q/I6xuBD1jBVyrlN/jnB5XdKvNlHZjcJM95kfWGiY cO0LvB8CY9if2e6re9+rL3wUk3X+TB1c6VHiLGs6HyK8PQgigC+KOFwlW2+cOAT3oUjIWL 96WIa5k91nx4EBICUtXkSL/RaxJlGTwmBQcOnOVpqkYqkdaqBrmtcslpiRURRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790044301; 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=tuJTl+6Uta/imFXsEfQGSDMAN9fgdFw+yVldVECN0ys=; b=Xz6D0qlqO72kgfBkYWBUsh6bNxMJYgSNgin/Rxdy4/dQb2QBetWa+DAWA5rURzDLo3vnCG VGrYEwoc/RrORNWQTccRPUj+BfoFVHTHummZpwIehUYV0CWbQlSnt96pr4tfDGyRATLG0s p21d17xA/H+xlEmdQqYK81v5ImLsiPH0OouQvLbQUdHIsiBSxuS8DOYs21y+VLo3xoxWba osiELOqL3kVo0uxT2fUXn00vG1TOMuNKgxuroDQzAbjo8RASWpSCMRF8CtKPDTHLMvWySS xr1zAPDNiHKhOn5fZkan3RH/Ixm081V/AlwbFqG2CwcUmKFnIsx//WNY/buMkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hpkcs0pcLznk4 for ; Tue, 22 Sep 2026 02:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e95e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 02:31:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 30c20ca26e10 - main - Remove Dtrace/ZFS tests if their knobs are disabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30c20ca26e105cffc5f37a95964cd9b2cad1b6cd Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 02:31:41 +0000 Message-Id: <6ab1e88d.1e95e.67f13a84@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=30c20ca26e105cffc5f37a95964cd9b2cad1b6cd commit 30c20ca26e105cffc5f37a95964cd9b2cad1b6cd Author: Enji Cooper AuthorDate: 2026-09-22 02:27:04 +0000 Commit: Enji Cooper CommitDate: 2026-09-22 02:31:34 +0000 Remove Dtrace/ZFS tests if their knobs are disabled Prior to this change, Dtrace and ZFS tests and their respective directories would remain installed even if `${MK_DTRACE_TESTS}` == no or `${MK_ZFS_TESTS}` == no. This change enhances the logic to remove the tests when the respective knobs are disabled so the tests will be removed when `make delete-old` is run. MFC after: 2 weeks --- tools/build/mk/OptionalObsoleteFiles.inc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 70c318f6989a..0511a27a6407 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1672,6 +1672,18 @@ OLD_DIRS+=usr/share/dtrace/toolkit OLD_DIRS+=usr/share/dtrace .endif +.if ${MK_DTRACE_TESTS} == no +DTRACE_TEST_DIRS= cddl/usr.sbin/dtrace +. for d in ${DTRACE_TEST_DIRS} +. if exists(${DESTDIR}${TESTSBASE}/${d}/) +TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo +OLD_DIRS+=${TESTS_DIRS} +TESTS_FILES!=find ${DESTDIR}${TESTSBASE}/${d}/ -type f | sed -e 's,^${DESTDIR}/,,'; echo +OLD_FILES+=${TESTS_FILES} +. endif +. endfor +.endif + .if ${MK_EE} == no OLD_FILES+=usr/bin/edit OLD_FILES+=usr/bin/ee @@ -9438,6 +9450,19 @@ OLD_DIRS+=usr/share/zfs/compatibility.d OLD_DIRS+=usr/share/zfs .endif +.if ${MK_ZFS_TESTS} == no +ZFS_TEST_DIRS= cddl/usr.bin/ztest +ZFS_TEST_DIRS+= cddl/usr.sbin/zfsd +. for d in ${ZFS_TEST_DIRS} +. if exists(${DESTDIR}${TESTSBASE}/${d}/) +TESTS_DIRS!=find ${DESTDIR}${TESTSBASE}/${d}/ -type d | sed -e 's,^${DESTDIR}/,,'; echo +OLD_DIRS+=${TESTS_DIRS} +TESTS_FILES!=find ${DESTDIR}${TESTSBASE}/${d}/ -type f | sed -e 's,^${DESTDIR}/,,'; echo +OLD_FILES+=${TESTS_FILES} +. endif +. endfor +.endif + .if ${MK_ZONEINFO} == no OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan OLD_FILES+=usr/share/zoneinfo/Africa/Accra