From nobody Sat Sep 07 14:45:48 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 4X1G9m4bMNz5VXBn; Sat, 07 Sep 2024 14:45:48 +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 4X1G9m3fZDz49k6; Sat, 7 Sep 2024 14:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725720348; 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=ANvF4wOLL5DUa5Dob/CinO0PflXai3kYrR+kP9QFWLY=; b=vNcxDUHozm+o2zos70SmMZJudc5YI/vE3RlLhYr96lWeh5b3O3e8ZzrCK2w3f4kYK9WVna 11zcCP8WxyN7DITfkiKrS3+9tOa5DfiukNrhon6wk3axTeDCVUPC16EbyrfiMFuQzowmOC zbwDhy2j+rs8WUEas0SzIfYPBSGqo9zOVQzHJk4Au/a5iFVEe4mPslKWSaiSShJsf7TCHz jsVDrj+K/iL95NikmPJmNDoom2cbhnh1Ao9exO5Hgd7pbyP+lu3v9I9Jaf8jEPwELtBX9P TDY0NsRSu9adFCtWdial7I67tkypiDayf4FPC/ohotw93RxGxlCKp8uCCNF7Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725720348; a=rsa-sha256; cv=none; b=kBWc+nQfqCaoc2EoNnvdGniQZBoNjO9zDhwHIZHTFDC94eitZX5HVrkTpG3wSlCLOUp0b4 ZJsksHzRis8dCTZu3PtJmBMikRJFOPtsPwsC33z2lh3mDrO8gfAMc3O5IkhNgq96Hn9GrV LHDsM4/o9xDfalf6M8m/gx3TgfbYg3PD4EV6Y7IIOulp3NBZ0qu9Zebduoy+Y7BgrwSGPX 3viTL4vq/8qtBaCF7MdEGgXB6DecWGSqrQaD+cGDw8EwovSy/DcstWSYDzbOseHLbeIH5G Sx7rQ06SfEKLZ2xrB/++yFTM5IYWRLnj7fwdhFFZD7IQChMD2FkyHAvt1r6e0g== 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=1725720348; 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=ANvF4wOLL5DUa5Dob/CinO0PflXai3kYrR+kP9QFWLY=; b=qlvVjmmJ5uczbtplkRMX5H4eyc8x2ZLHVRiB+tphrNAnJW4oE/xOHeYRHzWEJPh/CjqKN/ wQl0CkAXZma3yBi+WHJSxiuNIKuJkEmFEd+iu9FBxLsjTlDjTvHmrydgw19ZSNtjCtRgz6 fF8YuyvvVjAjWMl8Ggp3sUYvQktEIlT/3ggiTom1exU5sP246VtD+mciZrlPQyto+pj1K3 gl/yUeePzGnCSu88teuAuZIcFLgv4Q+mRvqdqP/OoJu6xnY168Molg6VfIMRTC3XWyVSBa AsUJO650on8IHi6V+wJrFjXvXvVgJhnDRC9TTOR7vEsYZab4Yc3Y6HwyfKWPqg== 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 4X1G9m3GWDzfB6; Sat, 7 Sep 2024 14:45:48 +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 487EjmdV068399; Sat, 7 Sep 2024 14:45:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487EjmVC068396; Sat, 7 Sep 2024 14:45:48 GMT (envelope-from git) Date: Sat, 7 Sep 2024 14:45:48 GMT Message-Id: <202409071445.487EjmVC068396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 24affded3d4e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 24affded3d4ec5fafb6b22f773ec1e20d73b9b03 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24affded3d4ec5fafb6b22f773ec1e20d73b9b03 commit 24affded3d4ec5fafb6b22f773ec1e20d73b9b03 Author: Mark Johnston AuthorDate: 2024-09-07 14:36:28 +0000 Commit: Mark Johnston CommitDate: 2024-09-07 14:36:28 +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 --- 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 c10598246639..179b444a8ec7 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -187,6 +187,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 6049a70fc613..66377e1e3bfd 100644 --- a/tests/sys/cddl/Makefile +++ b/tests/sys/cddl/Makefile @@ -4,7 +4,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.