[src/trunk]: src/tests/fs Hook ZFS tests to MKZFS instead of a homegrown vari...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f4081f132f8f
branches:  trunk
changeset: 781304:f4081f132f8f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Aug 31 14:46:53 2012 +0000

description:
Hook ZFS tests to MKZFS instead of a homegrown variable.

diffstat:

 tests/fs/common/Makefile |  4 ++--
 tests/fs/vfs/Makefile    |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 27742249d0f3 -r f4081f132f8f tests/fs/common/Makefile
--- a/tests/fs/common/Makefile  Fri Aug 31 14:31:46 2012 +0000
+++ b/tests/fs/common/Makefile  Fri Aug 31 14:46:53 2012 +0000
@@ -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 @@
        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
diff -r 27742249d0f3 -r f4081f132f8f tests/fs/vfs/Makefile
--- a/tests/fs/vfs/Makefile     Fri Aug 31 14:31:46 2012 +0000
+++ b/tests/fs/vfs/Makefile     Fri Aug 31 14:46:53 2012 +0000
@@ -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+=-lutil
 
-.ifdef WANT_ZFS_TESTS
+.if (${MKZFS} != "no")
 LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd
 CPPFLAGS+=-DWANT_ZFS_TESTS
 .endif