[src/trunk]: src/tests/fs/ffs Include h_fsmacros instead of ffs.c and link in...

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

details:   https://anonhg.NetBSD.org/src/rev/cae8d0009109
branches:  trunk
changeset: 756492:cae8d0009109
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Jul 19 16:22:05 2010 +0000

description:
Include h_fsmacros instead of ffs.c and link in test lib.

diffstat:

 tests/fs/ffs/Makefile  |  5 ++++-
 tests/fs/ffs/t_mount.c |  6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 20d3d5bfd1ad -r cae8d0009109 tests/fs/ffs/Makefile
--- a/tests/fs/ffs/Makefile     Mon Jul 19 16:21:22 2010 +0000
+++ b/tests/fs/ffs/Makefile     Mon Jul 19 16:22:05 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2010/07/14 21:39:31 pooka Exp $
+#      $NetBSD: Makefile,v 1.10 2010/07/19 16:22:05 pooka Exp $
 #
 
 TESTSDIR=      ${TESTSBASE}/fs/ffs
@@ -14,4 +14,7 @@
 LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet        # fifos
 LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread                   # base
 
+LDFLAGS+=-L${.CURDIR}/../common
+LDADD+=-lvfstest
+
 .include <bsd.test.mk>
diff -r 20d3d5bfd1ad -r cae8d0009109 tests/fs/ffs/t_mount.c
--- a/tests/fs/ffs/t_mount.c    Mon Jul 19 16:21:22 2010 +0000
+++ b/tests/fs/ffs/t_mount.c    Mon Jul 19 16:22:05 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_mount.c,v 1.5 2010/07/13 15:50:31 njoly Exp $        */
+/*     $NetBSD: t_mount.c,v 1.6 2010/07/19 16:22:05 pooka Exp $        */
 
 /*
  * Adapted for rump and atf from a testcase supplied
@@ -7,13 +7,13 @@
 
 #include <atf-c.h>
 
-#include "../common/ffs.c"
-
 #define IMGNAME "image.ffs"
 #define IMGSIZE (96 * 512)
 
 #define MNTDIR  "/mnt"
 
+#include "../common/h_fsmacros.h"
+
 ATF_TC(48Kimage);
 ATF_TC_HEAD(48Kimage, tc)
 {