From nobody Fri Sep 20 11:40:03 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 4X99RR3XvVz5Wf6Y; Fri, 20 Sep 2024 11:40:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X99RR2WlXz4lhc; Fri, 20 Sep 2024 11:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726832403; 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=CIue6DGsrEAQPorG9MgKLe0WCeiZ97EB0k5BDPWxSt8=; b=G1RaoU5VLaDM4KHMxj3ypNg5ec8A0APKj8lmIJKX/qG1+g1je3mVVsdRpJx86S/jQhj4gC AHdPYLUwUiicJ7qWoDlX+9l233I5+3FmW0qFh+M68/+Ciehod6CEPKeyK6W5ax9TmsdFn6 GJSDl/IyK+6Ixdj4vo2stTgkPYPijqeAQ0yN9B2zBsht63Sy7nFDIRf5o5ITQK2g8KBL0m OQIdjiNzM4n8LcIxK6rRDsitwRrtnQbPYxuCNvbyAqQJN/p2g4hu6wVIC60jprYsVcKQiE ZSduitvZD4VMXWXbJc/U7LGjSvKcb6WLJEf/h3DFOvm6k0RL42vfxd2nY+bijw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726832403; a=rsa-sha256; cv=none; b=JOAoU64fkSOu87Bd1z6YaNzGgUB1gILguoEggygkX5FA0Chp8xoKYUJsEDIPWFVzb7PmpX t4yz5eeFtmSCqM9P7VA5FxQjOjHlEzG5uyzy9vpUCZCHue4oEWuOXf+4vlj7A2/RMAGgSw pCH1B2C5amCIgj72Do+fyY07IfqbKx0/Rd6ZFlSSvbpZXMVf74OeETY2NKHLrpFJwl8fuB fXLJ0Vpox5otWrzJs8jOwDvYwTWf6vqpziVAOzX0mKGFSadl7W5hL+IYbVVSnwciepyFJr p5Yc0Jz9PX5sjXOkuJ6miqn3K/Q67N95kAMfDwjPEpHZzzAp53KySOn0SNvCJQ== 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=1726832403; 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=CIue6DGsrEAQPorG9MgKLe0WCeiZ97EB0k5BDPWxSt8=; b=uES5lP/FfH5+p7ZuP2vCY7wStYm+yLtJ5C/IGqJroVaNUfsvG21kBlqTDp6/SQFb7GxlNe QBwl5PwNpAFXwyRtXC8C7Tx1Sr9F65U4c++LmA36yOMBWhvScnSlWz+qfYtsl2b/iqJ68H PICgnozJZRzIoj38xrL28unHKnkN1FbaGN068WAPhTxVpzdoEPN+x4GiCxkqBFo/P6OQhM rujramn32qzwcacMb/sW0mTU8NA41Kn5Cehn3QfGoUEydRq+D1PW9StlcQoHH0rc17SfCw 8xj+0FC4mZ22qVUwQDArFBmsFI5Vnan3CxxODFIo/jK8aaZFpz/CZ+wOiVQLfA== 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 4X99RR250Pzp2M; Fri, 20 Sep 2024 11:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KBe3P4006904; Fri, 20 Sep 2024 11:40:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KBe34d006900; Fri, 20 Sep 2024 11:40:03 GMT (envelope-from git) Date: Fri, 20 Sep 2024 11:40:03 GMT Message-Id: <202409201140.48KBe34d006900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 20191b71bae1 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 20191b71bae1f86ecc03e67d60ad801a72ea05d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=20191b71bae1f86ecc03e67d60ad801a72ea05d2 commit 20191b71bae1f86ecc03e67d60ad801a72ea05d2 Author: Mark Johnston AuthorDate: 2024-09-07 14:36:28 +0000 Commit: Mark Johnston CommitDate: 2024-09-20 11:39:16 +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 a12a748a6055..600daa9ef61b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -190,6 +190,7 @@ __DEFAULT_YES_OPTIONS = \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ ZFS \ + ZFS_TESTS \ LOADER_ZFS \ ZONEINFO @@ -444,6 +445,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.