Module Name: src
Committed By: pooka
Date: Fri Aug 31 14:46:54 UTC 2012
Modified Files:
src/tests/fs/common: Makefile
src/tests/fs/vfs: Makefile
Log Message:
Hook ZFS tests to MKZFS instead of a homegrown variable.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/common/Makefile
cvs rdiff -u -r1.17 -r1.18 src/tests/fs/vfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/Makefile
diff -u src/tests/fs/common/Makefile:1.8 src/tests/fs/common/Makefile:1.9
--- src/tests/fs/common/Makefile:1.8 Mon Aug 20 16:37:35 2012
+++ src/tests/fs/common/Makefile Fri Aug 31 14:46:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/08/20 16:37:35 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/31 14:46:54 pooka Exp $
#
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ SRCS= fstest_ext2fs.c fstest_ffs.c fstes
fstest_nfs.c fstest_puffs.c fstest_rumpfs.c fstest_sysvbfs.c \
fstest_tmpfs.c fstest_v7fs.c
-.ifdef WANT_ZFS_TESTS
+.if (${MKZFS} != "no")
SRCS+= fstest_zfs.c
CPPFLAGS+=-DWANT_ZFS_TESTS
.endif
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.17 src/tests/fs/vfs/Makefile:1.18
--- src/tests/fs/vfs/Makefile:1.17 Mon Aug 20 16:37:35 2012
+++ src/tests/fs/vfs/Makefile Fri Aug 31 14:46:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/08/20 16:37:35 pooka Exp $
+# $NetBSD: Makefile,v 1.18 2012/08/31 14:46:53 pooka Exp $
#
.include <bsd.own.mk>
@@ -38,7 +38,7 @@ LDADD+=-lrumpvfs -lrump -lrumpuser -lpth
LDADD+=-lutil
-.ifdef WANT_ZFS_TESTS
+.if (${MKZFS} != "no")
LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd
CPPFLAGS+=-DWANT_ZFS_TESTS
.endif
