Module Name: src
Committed By: pooka
Date: Mon Jul 12 13:09:20 UTC 2010
Modified Files:
src/tests/fs/puffs: Makefile t_basic.c
Log Message:
put stuff requiring -lpuffs behind -DPUFFSDUMP
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/puffs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/puffs/t_basic.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/puffs/Makefile
diff -u src/tests/fs/puffs/Makefile:1.7 src/tests/fs/puffs/Makefile:1.8
--- src/tests/fs/puffs/Makefile:1.7 Sun Jul 11 12:33:38 2010
+++ src/tests/fs/puffs/Makefile Mon Jul 12 13:09:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/07/11 12:33:38 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2010/07/12 13:09:19 pooka Exp $
#
.include <bsd.own.mk>
@@ -14,7 +14,9 @@
LDADD+= -lrumpnet_local -lrumpnet_net -lrumpnet
LDADD+= -lrumpvfs
LDADD+= -lrump -lrumpuser -lpthread
-LDADD+= -lpuffs -lutil
+
+# required by -DPUFFSDUMP
+#LDADD+= -lpuffs -lutil
WARNS=2
Index: src/tests/fs/puffs/t_basic.c
diff -u src/tests/fs/puffs/t_basic.c:1.5 src/tests/fs/puffs/t_basic.c:1.6
--- src/tests/fs/puffs/t_basic.c:1.5 Sun Jul 11 12:33:38 2010
+++ src/tests/fs/puffs/t_basic.c Mon Jul 12 13:09:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.5 2010/07/11 12:33:38 pooka Exp $ */
+/* $NetBSD: t_basic.c,v 1.6 2010/07/12 13:09:19 pooka Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -57,6 +57,7 @@
rump_sys_statvfs1(fs, &svb, ST_WAIT);
}
+#ifdef PUFFSDUMP
static void __unused
dumpopcount(void)
{
@@ -74,6 +75,7 @@
puffsdump_vnop_revmap[i], vn_toserv_ops[i]);
}
}
+#endif
/*
* Threads which shovel data between comfd and /dev/puffs.
