From nobody Tue Sep 22 02:53:33 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 4hpl660TPzz6stm6 for ; Tue, 22 Sep 2026 02:53:34 +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 4hpl653kF7z4fTY for ; Tue, 22 Sep 2026 02:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790045613; 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=sq1g75alH/WOUqLuKLe7Inc/iNR73e3Kuo74gK+SyQ8=; b=gSVpHo0XSarfTYmHDorAeR1jOwd3YCIINFYRnDq/RIk73bDJGgO8zO44i5ieGgMu6GDN/9 3dqFHWFAV79yfGV3n8uzkGz28qT7NSNW50qTlNrfP0nCT3wrE2lOWBoYWtJzYK+U0rdYkU 5faHvgUZuWTN/rn5GRMMSLBp3WbHCFQMFdwlp9Fvn+dm3vCWtz+r3qRwJacnoYk5nymJY4 6SeqgUQf2Gs6tP7nQHjd8ssh8fvmsL4un/85eUg+BO40palOvLGbR7zhm6yjoamWnayPWj zWKu8SxpMcK4L4FbftPooZhRJNUD+VcTxsj72yRMSYf9cF9MXJgHc6MB/jmJdQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790045613; b=oPP4Tl6NqzFrX308/FSEqtrtof8PsNqPl9qV3VY54mkGFU53gibJlCxqjPmH0YPdxpi1Nz 3II6A5m30UBh9VMU/+IJSFmYkTKUxHJMCRrbhTp6S2YAYZcn9Dao1YhTA63HwLBfEMgy5b ideT+9sZAD+caJSAjmHpInyRA8nnMIPRVW2OZFhHgB8cdc1xedQMX1zloKCLzQDvNxT32h gP0Y8mjGHimuZLMiHa8y4TpI2l4xn6A9x3u2lBaz2++Rh0BwwIyfXp00fMq2khKM+tQ9Mr 4yaOFpP+Cpk6r3Ktlwd8Yv4ntUMC2to7hAWJfpsvAsghu+ma1YLTdOONEP4e0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790045613; 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=sq1g75alH/WOUqLuKLe7Inc/iNR73e3Kuo74gK+SyQ8=; b=Hz5nhtqK2qL0xqPN8ILDAnrdo587IhHv2OIGnM0EmZbZ1y225HlkJXx/mHVbVtTrZtv6Td 7vUj69H17r13jOvNcnABDOA7bRM59teU+V+qpjSFtsydCsiw14crOoBOytUFk+ZjcFJ6FX id1+15OjDWmAUUQf9EPsdWcrD77qaWOBfvoDCJK7qdmVyMDeORM9yWt4Z9YYAtLmkVk1u/ HuxYdadV4yYwwdRl1v5VC1VFpIJdBnydapI00wx1nlbrzmM44riKW1IKv2frc+xIfrSOkH 6+/rt1aJwrRGzt/ZXSk0M1WLydHDSQ1dNTSEXolS7wAjkgnN+Jdi4E347eAh2w== 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 4hpl652hQVzpQW for ; Tue, 22 Sep 2026 02:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23d37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 02:53:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: df6131e2b74d - main - Remove CDDL and ctfconvert tests when their controlling 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: df6131e2b74d9f334c16387e9a46cafd6e27eb78 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 02:53:33 +0000 Message-Id: <6ab1edad.23d37.77e4be44@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=df6131e2b74d9f334c16387e9a46cafd6e27eb78 commit df6131e2b74d9f334c16387e9a46cafd6e27eb78 Author: Enji Cooper AuthorDate: 2026-09-22 02:46:52 +0000 Commit: Enji Cooper CommitDate: 2026-09-22 02:53:03 +0000 Remove CDDL and ctfconvert tests when their controlling knobs are disabled In the event someone specified MK_CDDL == no prior to this change, all tests under `/usr/tests/cddl` would stick around after the change, resulting in errors. Similarly, MK_DTRACE == no removed ctfconvert, which the ctfconvert tests relied on (but remained around after the knob was disabled). Remove the tests under the respective blocks now so they don't linger around on systems where these knobs are disabled, resulting in false positives when running the complete test suite. The ctfconvert tests weren't specifically put under `${MK_DTRACE_TESTS}` == no because ctfconvert was bundled separately from the upstream provided Dtrace test suite. MFC after: 2 weeks MFC with: 30c20ca26 ("Remove Dtrace/ZFS tests if their knobs are disabled") --- tools/build/mk/OptionalObsoleteFiles.inc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0511a27a6407..bb98b3a73616 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1436,6 +1436,18 @@ OLD_FILES+=usr/share/man/man1/llvm-pdbutil.1.gz OLD_FILES+=usr/share/man/man1/opt.1.gz .endif +.if ${MK_CDDL} == no +CDDL_TEST_DIRS= cddl +. for d in ${CDDL_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_CLANG_EXTRAS} == no && ${MK_CLANG_FORMAT} == no OLD_FILES+=usr/bin/clang-format .endif @@ -1670,6 +1682,16 @@ OLD_DIRS+=usr/lib${libcompat}/dtrace OLD_DIRS+=usr/libexec/dwatch OLD_DIRS+=usr/share/dtrace/toolkit OLD_DIRS+=usr/share/dtrace + +CTFCONVERT_TEST_DIRS= cddl/usr.bin/ctfconvert +. for d in ${CTFCONVERT_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_DTRACE_TESTS} == no