Module Name: src
Committed By: pooka
Date: Mon Jul 19 16:22:05 UTC 2010
Modified Files:
src/tests/fs/ffs: Makefile t_mount.c
Log Message:
Include h_fsmacros instead of ffs.c and link in test lib.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/ffs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/ffs/t_mount.c
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/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.9 src/tests/fs/ffs/Makefile:1.10
--- src/tests/fs/ffs/Makefile:1.9 Wed Jul 14 21:39:31 2010
+++ src/tests/fs/ffs/Makefile Mon Jul 19 16:22:05 2010
@@ -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>
Index: src/tests/fs/ffs/t_mount.c
diff -u src/tests/fs/ffs/t_mount.c:1.5 src/tests/fs/ffs/t_mount.c:1.6
--- src/tests/fs/ffs/t_mount.c:1.5 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/ffs/t_mount.c Mon Jul 19 16:22:05 2010
@@ -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)
{
