summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authornia <nia@NetBSD.org>2022-05-27 07:28:20 +0000
committernia <nia@NetBSD.org>2022-05-27 07:28:20 +0000
commitaa9bc1445fdbfac0e78c33d2e7007cfc8d29d1b4 (patch)
treef521b5c58c1b3eb79493018f0d64ad6159e59171 /tests
parent8725cfcecc30fe91e8eb8ebd71b72a5d687648f5 (diff)
mk: Add a MKLFS flag for excluding the log-structured filesystem userspace
tools from the build.
Diffstat (limited to 'tests')
-rw-r--r--tests/fs/Makefile8
-rw-r--r--tests/fs/vfs/Makefile7
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/fs/Makefile b/tests/fs/Makefile
index eb53869041b..95c89686c72 100644
--- a/tests/fs/Makefile
+++ b/tests/fs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/05/10 14:15:25 martin Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/27 07:28:21 nia Exp $
.include <bsd.own.mk>
@@ -6,10 +6,14 @@ TESTSDIR= ${TESTSBASE}/fs
SUBDIR+= common .WAIT
-TESTS_SUBDIRS+= ffs fifofs hfs kernfs lfs msdosfs nfs nullfs psshfs ptyfs puffs
+TESTS_SUBDIRS+= ffs fifofs hfs kernfs msdosfs nfs nullfs psshfs ptyfs puffs
TESTS_SUBDIRS+= tmpfs umapfs union
TESTS_SUBDIRS+= vfs cd9660
+.if ${MKLFS} != "no"
+TESTS_SUBDIRS+= lfs
+.endif
+
.if ${MKZFS} != "no"
TESTS_SUBDIRS+= zfs
.endif
diff --git a/tests/fs/vfs/Makefile b/tests/fs/vfs/Makefile
index 6ebac6bd0f5..721f1e282ef 100644
--- a/tests/fs/vfs/Makefile
+++ b/tests/fs/vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/03/28 20:51:04 christos Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/27 07:28:21 nia Exp $
#
.include <bsd.own.mk>
@@ -30,7 +30,6 @@ LDADD+=-lrumpnet_shmif -lrumpnet -lrumpnet_net -lrumpnet_netinet# TCP/IP
LDADD+=-lrumpfs_nfs # NFS
LDADD+=-lrumpfs_ext2fs # ext2fs
LDADD+=-lrumpfs_ffs # ffs
-LDADD+=-lrumpfs_lfs # lfs
LDADD+=-lrumpfs_msdos # msdos
LDADD+=-lrumpfs_syspuffs # puffs
LDADD+=-lrumpdev_putter -lrumpdev # \ putter
@@ -51,6 +50,10 @@ LDADD+=-lrumpnet # static linking
LDADD+=-lutil
+.if (${MKLFS} != "no")
+LDADD+=-lrumpfs_lfs
+.endif
+
.if (${MKZFS} != "no")
LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd -lrumpkern_sysproxy
CPPFLAGS+=-DWANT_ZFS_TESTS