From nobody Fri Nov 21 15:19:21 2025 X-Original-To: dev-commits-src-branches@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 4dCf5V2csJz6HLm2 for ; Fri, 21 Nov 2025 15:19:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCf5V1L9dz3nqc for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; 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=rrJ0KOkCiTnqEOzH48mF3STxjMmNeqa62TeKQFbknzc=; b=gA6sTfaQFA0YVVq4zxupfVkebeu+0tisnnKZKL3mYIh5B3lzE5v3VKvhaHkFgDp8kCCrQU o4vv5ikKEn4mRnZ+Htf4AOtObGuMVyh6clbIiepp6hgjybSMua/Va2KSMu2wYaA9R32Z5x cA33uXyxkQGoanWWt4OI49wSlLA247w8saH4OydX71rTsV7lReaERK4Pme5M7FFreT3Gqn 73nzTCAgYXzBYC4i/iegg0PIy/sTdn1sbNr0cdZTooWyQK7zo9ArVfutrRvFWcdYDFbY+0 JtgwveVjd6a2GLlOKYd6YAWgMz+xqzemOzzP1W8cMfCEuf6DPsWIWDOcg8kT9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738366; 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=rrJ0KOkCiTnqEOzH48mF3STxjMmNeqa62TeKQFbknzc=; b=n11DICMuL8hIl5tLtrVVP4q4qw30qssvP0I2W57y139UidvYL8umuzFiIB/dm+7FAyvdef TxNbzRZOWj7Bw0meJwwz6hbyjtNTXo45aKcJGH62rcb+G/xEEzChZ7de3Uw+N2Yolawc1R bi8PuDdyc4PDeEKmA2loxQZUiuLmCuP5zcPt2NZ3Dy7xS6rakQq5NRB6UhB68RAz+lLl8c hSFodglSBZBMGc6LDv/mbKGCPjAWbJIVkguFrwtXDbGOpWqpzbaEJRPmM41l4+o6Q3tHkw X/ZzPX3Pm6Q1IMDEPHOBu5nHPE9SIP7lowM9NFtyscr/jFd2JQSEB1jK3pcP7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738366; a=rsa-sha256; cv=none; b=EkI6z93fmgljKXPEONzT06q8x5lzTxcEeXVsmw8kDJtv6MF8EapbS5tT1Lwo49s0G25BYx XPIWc1OKfNg72hB8vYHSrT9hDWHFTPAqheZwha5R+8q3/wawpqsGC+YMhzPiGx2h98JPbM dIRrDzvNbFXddJEHN6UyBoZ5EVMDmCu9P53qXCSs2fDWJyV9hRFG0a1cF2uTr90eoGcLy7 n1rUqe+fkSKWQZ9801F5ZDRzGCljZUVHdS2Og/VzIevUr3bT/DtJCwoS7SLhPVv5DErEWq LuNe9/NMQnYgayPYP1zv6DWu6bi1Z+gMAz36F5Yt7waIb3nzBFe1SjUqWMrYNQ== 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 4dCf5V0jNMz2Qk for ; Fri, 21 Nov 2025 15:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3053c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 15:19:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 90118a35a3ae - stable/13 - src.conf: Add a MK_ZFS_TESTS knob List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 90118a35a3ae469ca91a4c52b3623bf4d0c5212e Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 15:19:21 +0000 Message-Id: <692082f9.3053c.536f8829@gitrepo.freebsd.org> The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=90118a35a3ae469ca91a4c52b3623bf4d0c5212e commit 90118a35a3ae469ca91a4c52b3623bf4d0c5212e Author: Mark Johnston AuthorDate: 2024-09-07 14:36:28 +0000 Commit: Mark Johnston CommitDate: 2025-11-19 20:47:50 +0000 src.conf: Add a MK_ZFS_TESTS knob The in-tree ZFS test suite is somewhat outdated and I see a number of failures there. I tend to think that we want to integrate the OpenZFS test suite somehow, replacing the legacy one, though it's also possible to run that as a separate test suite. In any case, if one wants to run the OpenZFS test suite separately, it's useful to be able to disable installation of the legacy ZFS test suite, so let's provide a src.conf option to do that. Reviewed by: asomers MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46476 (cherry picked from commit 24affded3d4ec5fafb6b22f773ec1e20d73b9b03) --- share/mk/src.opts.mk | 6 ++++++ tests/sys/cddl/Makefile | 2 +- tools/build/options/WITHOUT_ZFS_TESTS | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 811b0a493d50..d8872f93bfcd 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -192,6 +192,7 @@ __DEFAULT_YES_OPTIONS = \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ ZFS \ + ZFS_TESTS \ LOADER_ZFS \ ZONEINFO @@ -459,6 +460,11 @@ MK_OFED_EXTRA:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +MK_ZFS_TESTS:= no +.endif + +.if ${MK_ZFS} == "no" +MK_ZFS_TESTS:= no .endif .if ${MK_TESTS_SUPPORT} == "no" diff --git a/tests/sys/cddl/Makefile b/tests/sys/cddl/Makefile index 80c72ea5ec42..377faae73522 100644 --- a/tests/sys/cddl/Makefile +++ b/tests/sys/cddl/Makefile @@ -5,7 +5,7 @@ TESTSDIR= ${TESTSBASE}/sys/cddl TESTS_SUBDIRS+= ${_zfs} -.if ${MK_ZFS} != "no" +.if ${MK_ZFS_TESTS} != "no" _zfs= zfs .endif diff --git a/tools/build/options/WITHOUT_ZFS_TESTS b/tools/build/options/WITHOUT_ZFS_TESTS new file mode 100644 index 000000000000..ae2ac45ca0f3 --- /dev/null +++ b/tools/build/options/WITHOUT_ZFS_TESTS @@ -0,0 +1 @@ +Do not build and install the legacy ZFS test suite.