From 24affded3d4ec5fafb6b22f773ec1e20d73b9b03 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Sat, 7 Sep 2024 14:36:28 +0000 Subject: [PATCH] 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(-) create mode 100644 tools/build/options/WITHOUT_ZFS_TESTS diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c1059824663..179b444a8ec 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 6049a70fc61..66377e1e3bf 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 00000000000..ae2ac45ca0f --- /dev/null +++ b/tools/build/options/WITHOUT_ZFS_TESTS @@ -0,0 +1 @@ +Do not build and install the legacy ZFS test suite.