From nobody Fri Nov 21 15:19:21 2025 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 4dCf5P24RWz6HLnR for ; Fri, 21 Nov 2025 15:19:21 +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 4dCf5P1B8Pz3nyD for ; Fri, 21 Nov 2025 15:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738361; 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=NvmySVhWI/lWXlR10kEwrXCxvS27xNDZuvEAwqvqCflQ0V0ejI/GnXsEoM74Mo/5l0uy2w kxvIzvjdptURBSR1r2Ugs75aCqSCJljQqNA+QlxygGyxDh6RGmrUTCvtIIDusAW6F52e2J WR7UvRDJAYQ6Nblp/KHrt4/deRP1VZIIUriunQ6Efsi4ia5EBpmIK/ThMs2RZBQ1ghbTt7 PUA7HhpfyJqvWdokPtpQDwIrCcHtbbY7MnwnZVEnPntIxh8jy3s2mh9oVoJGDtNTh8NMIK chKdOTFMlNMfXYesMmroxFOKGYRMtrZW+uxngDRlGbsBTesKrm07sFi4pP9arw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763738361; 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=SkWHp0F2rqtTo28FJpE4BqIqctgOXcxW7+kM5gkj4Ro9iNp6vOnbXmHGwI4iDVF0TjQ4rB SBOOhBjhKr+2ogbWqs0I5NlIUrxIQqfaahRwfokZMMJp6r0EI/4GVYiZksLhiIeWBOO7s4 awYXFJCXPC90E9njo+YYMOlwUvfSVPttKKOn7kvEPW351fh2IOOf4HnF8UxjucAYqK1iI7 TE3Rnu/msvvwKzghSHu099bpWAzJfW8seVRDQXt6uB+4wY54eRVblGSXLjOUfO3KBIsQgv iIImbXaHWcMtqxXzGYJakjm82XEDMQXspah+vp+04R/Lab4Cnr5ckOcs4hKmFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763738361; a=rsa-sha256; cv=none; b=DhR/HtxaF9UhR3brjJH5sStuGBsnx0DBwCza/y9+x89mvgrkgXqltrPOfq3YmwVxAAWLxQ K7IW4+ZywMaH+nf2IrcKdvqGZUTYoxTT+VtEMc7fjhoPJZW8OqGg0UvNBCMxv+iwfl4MzA 7Nm9/+dVKV0iSPC8R7jQpse5p10/Sn3oFKtsoi3Z+q+XaBkUjRa3pzjvZe4w2SvdD6+f8i Oajr0ezaikVgnmHakDebFIg+4EubikMSUeuYl3bGQLbv7Vawob/pY/+tWyh2ul/SamRmYU e++tyR5ZAOtXYnbo6m3Xh5yo2Os8HIA/Hcgmv2+3jegKAD0+fcbCpS20RLRpcg== 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 4dCf5P0j3Yz2g4 for ; Fri, 21 Nov 2025 15:19:21 +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: 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/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.