D46476.diff
No OneTemporary
Actions

Size

900 B

Referenced Files

None

Subscribers

None

D46476.diff
View Options

	diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
	--- a/share/mk/src.opts.mk
	+++ b/share/mk/src.opts.mk
	@@ -187,6 +187,7 @@
	WIRELESS \
	WPA_SUPPLICANT_EAPOL \
	ZFS \
	+ ZFS_TESTS \
	LOADER_ZFS \
	ZONEINFO

	@@ -444,6 +445,11 @@

	.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
	--- a/tests/sys/cddl/Makefile
	+++ b/tests/sys/cddl/Makefile
	@@ -4,7 +4,7 @@

	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
	--- /dev/null
	+++ b/tools/build/options/WITHOUT_ZFS_TESTS
	@@ -0,0 +1 @@
	+Do not build and install the legacy ZFS test suite.