Module Name: src
Committed By: pooka
Date: Mon Jul 19 16:09:08 UTC 2010
Modified Files:
src/tests/fs: Makefile
src/tests/fs/common: ext2fs.c ffs.c h_fsmacros.h lfs.c msdosfs.c
puffs.c sysvbfs.c tmpfs.c
src/tests/fs/vfs: Makefile
Added Files:
src/tests/fs/common: Makefile
Log Message:
Convert the file system test common routines into a library to
facilitate more complex user-side stuff (like the lfs cleaner and
nfs rpc code), which are non-trivial to do by #include.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/common/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/common/ext2fs.c \
src/tests/fs/common/ffs.c src/tests/fs/common/msdosfs.c \
src/tests/fs/common/sysvbfs.c src/tests/fs/common/tmpfs.c
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/common/h_fsmacros.h
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/common/lfs.c
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/common/puffs.c
cvs rdiff -u -r1.6 -r1.7 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/Makefile
diff -u src/tests/fs/Makefile:1.15 src/tests/fs/Makefile:1.16
--- src/tests/fs/Makefile:1.15 Tue Jul 13 21:13:22 2010
+++ src/tests/fs/Makefile Mon Jul 19 16:09:07 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2010/07/13 21:13:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2010/07/19 16:09:07 pooka Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/fs
-TESTS_SUBDIRS+= ffs kernfs lfs msdosfs nullfs psshfs ptyfs puffs
+TESTS_SUBDIRS+= common .WAIT ffs kernfs lfs msdosfs nullfs psshfs ptyfs puffs
TESTS_SUBDIRS+= tmpfs umapfs union
TESTS_SUBDIRS+= vfs
Index: src/tests/fs/common/ext2fs.c
diff -u src/tests/fs/common/ext2fs.c:1.4 src/tests/fs/common/ext2fs.c:1.5
--- src/tests/fs/common/ext2fs.c:1.4 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/common/ext2fs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.c,v 1.4 2010/07/13 15:50:31 njoly Exp $ */
+/* $NetBSD: ext2fs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,13 +43,15 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct ext2fstestargs {
struct ufs_args ta_uargs;
char ta_devpath[MAXPATHLEN];
char ta_imgpath[MAXPATHLEN];
};
-static int
+int
ext2fs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
off_t size)
{
@@ -89,7 +91,7 @@
return res;
}
-static int
+int
ext2fs_fstest_delfs(const atf_tc_t *tc, void *buf)
{
int res;
@@ -108,7 +110,7 @@
return 0;
}
-static int
+int
ext2fs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
{
int res;
@@ -123,7 +125,7 @@
return res;
}
-static int
+int
ext2fs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int res;
Index: src/tests/fs/common/ffs.c
diff -u src/tests/fs/common/ffs.c:1.4 src/tests/fs/common/ffs.c:1.5
--- src/tests/fs/common/ffs.c:1.4 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/common/ffs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.4 2010/07/13 15:50:31 njoly Exp $ */
+/* $NetBSD: ffs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,13 +43,15 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct ffstestargs {
struct ufs_args ta_uargs;
char ta_devpath[MAXPATHLEN];
char ta_imgpath[MAXPATHLEN];
};
-static int
+int
ffs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image, off_t size)
{
char cmd[1024];
@@ -87,7 +89,7 @@
return 0;
}
-static int
+int
ffs_fstest_delfs(const atf_tc_t *tc, void *buf)
{
int res;
@@ -106,7 +108,7 @@
return 0;
}
-static int
+int
ffs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
{
int res;
@@ -121,7 +123,7 @@
return res;
}
-static int
+int
ffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int res;
Index: src/tests/fs/common/msdosfs.c
diff -u src/tests/fs/common/msdosfs.c:1.4 src/tests/fs/common/msdosfs.c:1.5
--- src/tests/fs/common/msdosfs.c:1.4 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/common/msdosfs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs.c,v 1.4 2010/07/13 15:50:31 njoly Exp $ */
+/* $NetBSD: msdosfs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,13 +43,15 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct msdosfstestargs {
struct msdosfs_args ta_uargs;
char ta_devpath[MAXPATHLEN];
char ta_imgpath[MAXPATHLEN];
};
-static int
+int
msdosfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
off_t size)
{
@@ -89,7 +91,7 @@
return 0;
}
-static int
+int
msdosfs_fstest_delfs(const atf_tc_t *tc, void *buf)
{
int res;
@@ -108,7 +110,7 @@
return 0;
}
-static int
+int
msdosfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
{
int res;
@@ -123,7 +125,7 @@
return res;
}
-static int
+int
msdosfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int res;
Index: src/tests/fs/common/sysvbfs.c
diff -u src/tests/fs/common/sysvbfs.c:1.4 src/tests/fs/common/sysvbfs.c:1.5
--- src/tests/fs/common/sysvbfs.c:1.4 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/common/sysvbfs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs.c,v 1.4 2010/07/13 15:50:31 njoly Exp $ */
+/* $NetBSD: sysvbfs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,13 +43,15 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct sysvbfstestargs {
struct ufs_args ta_uargs;
char ta_devpath[MAXPATHLEN];
char ta_imgpath[MAXPATHLEN];
};
-static int
+int
sysvbfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
off_t size)
{
@@ -89,7 +91,7 @@
return 0;
}
-static int
+int
sysvbfs_fstest_delfs(const atf_tc_t *tc, void *buf)
{
int res;
@@ -108,7 +110,7 @@
return 0;
}
-static int
+int
sysvbfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
{
int res;
@@ -123,7 +125,7 @@
return res;
}
-static int
+int
sysvbfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int res;
Index: src/tests/fs/common/tmpfs.c
diff -u src/tests/fs/common/tmpfs.c:1.4 src/tests/fs/common/tmpfs.c:1.5
--- src/tests/fs/common/tmpfs.c:1.4 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/common/tmpfs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs.c,v 1.4 2010/07/13 15:50:31 njoly Exp $ */
+/* $NetBSD: tmpfs.c,v 1.5 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,11 +43,13 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct tmpfstestargs {
struct tmpfs_args ta_uargs;
};
-static int
+int
tmpfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
off_t size)
{
@@ -71,7 +73,7 @@
return 0;
}
-static int
+int
tmpfs_fstest_delfs(const atf_tc_t *tc, void *buf)
{
struct tmpfstestargs *args = buf;
@@ -81,7 +83,7 @@
return 0;
}
-static int
+int
tmpfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
{
int res;
@@ -96,7 +98,7 @@
return res;
}
-static int
+int
tmpfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int res;
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.10 src/tests/fs/common/h_fsmacros.h:1.11
--- src/tests/fs/common/h_fsmacros.h:1.10 Tue Jul 13 16:48:15 2010
+++ src/tests/fs/common/h_fsmacros.h Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.10 2010/07/13 16:48:15 pooka Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.11 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -37,13 +37,19 @@
#include <atf-c.h>
#include <string.h>
-#include "ext2fs.c"
-#include "ffs.c"
-#include "lfs.c"
-#include "msdosfs.c"
-#include "puffs.c"
-#include "sysvbfs.c"
-#include "tmpfs.c"
+#define FSPROTOS(_fs_) \
+int _fs_##_fstest_newfs(const atf_tc_t *, void **, const char *, off_t);\
+int _fs_##_fstest_delfs(const atf_tc_t *, void *); \
+int _fs_##_fstest_mount(const atf_tc_t *, void *, const char *, int); \
+int _fs_##_fstest_unmount(const atf_tc_t *, const char *, int);
+
+FSPROTOS(ext2fs);
+FSPROTOS(ffs);
+FSPROTOS(lfs);
+FSPROTOS(msdosfs);
+FSPROTOS(puffs);
+FSPROTOS(sysvbfs);
+FSPROTOS(tmpfs);
#define IMGNAME "image.fs"
#define IMGSIZE (10000 * 512)
Index: src/tests/fs/common/lfs.c
diff -u src/tests/fs/common/lfs.c:1.6 src/tests/fs/common/lfs.c:1.7
--- src/tests/fs/common/lfs.c:1.6 Tue Jul 13 15:50:31 2010
+++ src/tests/fs/common/lfs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.6 2010/07/13 15:50:31 njoly Exp $ */
+/* $NetBSD: lfs.c,v 1.7 2010/07/19 16:09:08 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -43,13 +43,15 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct lfstestargs {
struct ufs_args ta_uargs;
char ta_devpath[MAXPATHLEN];
char ta_imgpath[MAXPATHLEN];
};
-static int
+int
lfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image, off_t size)
{
char cmd[1024];
@@ -88,7 +90,7 @@
return 0;
}
-static int
+int
lfs_fstest_delfs(const atf_tc_t *tc, void *buf)
{
int res;
@@ -107,7 +109,7 @@
return 0;
}
-static int
+int
lfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
{
int res;
@@ -124,7 +126,7 @@
return res;
}
-static int
+int
lfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int res;
Index: src/tests/fs/common/puffs.c
diff -u src/tests/fs/common/puffs.c:1.2 src/tests/fs/common/puffs.c:1.3
--- src/tests/fs/common/puffs.c:1.2 Tue Jul 13 17:49:24 2010
+++ src/tests/fs/common/puffs.c Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.2 2010/07/13 17:49:24 pooka Exp $ */
+/* $NetBSD: puffs.c,v 1.3 2010/07/19 16:09:08 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -47,6 +47,8 @@
#include <rump/rump.h>
#include <rump/rump_syscalls.h>
+#include "h_fsmacros.h"
+
struct puffstestargs {
uint8_t *pta_pargs;
size_t pta_pargslen;
@@ -214,7 +216,7 @@
}
/* XXX: we don't support size */
-static int
+int
puffs_fstest_newfs(const atf_tc_t *tc, void **argp,
const char *image, off_t size)
{
@@ -300,7 +302,7 @@
return 0;
}
-static int
+int
puffs_fstest_mount(const atf_tc_t *tc, void *arg, const char *path, int flags)
{
struct puffstestargs *pargs = arg;
@@ -331,7 +333,7 @@
return 0;
}
-static int
+int
puffs_fstest_delfs(const atf_tc_t *tc, void *arg)
{
struct puffstestargs *pargs = arg;
@@ -350,7 +352,7 @@
return 0;
}
-static int
+int
puffs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
int rv;
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.6 src/tests/fs/vfs/Makefile:1.7
--- src/tests/fs/vfs/Makefile:1.6 Wed Jul 14 21:39:31 2010
+++ src/tests/fs/vfs/Makefile Mon Jul 19 16:09:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/07/14 21:39:31 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2010/07/19 16:09:08 pooka Exp $
#
TESTSDIR= ${TESTSBASE}/fs/vfs
@@ -20,4 +20,7 @@
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
+LDFLAGS+=-L${.CURDIR}/../common
+LDADD+=-lvfstest
+
.include <bsd.test.mk>
Added files:
Index: src/tests/fs/common/Makefile
diff -u /dev/null src/tests/fs/common/Makefile:1.1
--- /dev/null Mon Jul 19 16:09:08 2010
+++ src/tests/fs/common/Makefile Mon Jul 19 16:09:08 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2010/07/19 16:09:08 pooka Exp $
+#
+
+LIB= vfstest
+SRCS= ext2fs.c ffs.c lfs.c msdosfs.c puffs.c sysvbfs.c tmpfs.c
+
+LIBISPRIVATE= # yup
+
+.include <bsd.lib.mk>
