Module Name: src
Committed By: pooka
Date: Mon Mar 29 18:19:19 UTC 2010
Modified Files:
src/tests/fs: Atffile Makefile
Added Files:
src/tests/fs/union: Atffile Makefile t_basic.c
Log Message:
Add basic union test.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/Atffile src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/union/Atffile src/tests/fs/union/Makefile \
src/tests/fs/union/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/Atffile
diff -u src/tests/fs/Atffile:1.4 src/tests/fs/Atffile:1.5
--- src/tests/fs/Atffile:1.4 Sun Dec 30 09:13:32 2007
+++ src/tests/fs/Atffile Mon Mar 29 18:19:19 2010
@@ -1,6 +1,6 @@
Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.4 2007/12/30 09:13:32 jmmv Exp $"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.5 2010/03/29 18:19:19 pooka Exp $"
prop: test-suite = "NetBSD"
-tp-glob: *fs
+tp-glob: *fs union
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.4 src/tests/fs/Makefile:1.5
--- src/tests/fs/Makefile:1.4 Wed Apr 8 12:09:04 2009
+++ src/tests/fs/Makefile Mon Mar 29 18:19:19 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/04/08 12:09:04 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/03/29 18:19:19 pooka Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/fs
-SUBDIR= ffs puffs tmpfs
+SUBDIR+= ffs puffs tmpfs union
FILES= h_funcs.subr
FILESDIR= ${TESTSDIR}
Added files:
Index: src/tests/fs/union/Atffile
diff -u /dev/null src/tests/fs/union/Atffile:1.1
--- /dev/null Mon Mar 29 18:19:19 2010
+++ src/tests/fs/union/Atffile Mon Mar 29 18:19:19 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/03/29 18:19:19 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp: t_*
Index: src/tests/fs/union/Makefile
diff -u /dev/null src/tests/fs/union/Makefile:1.1
--- /dev/null Mon Mar 29 18:19:19 2010
+++ src/tests/fs/union/Makefile Mon Mar 29 18:19:19 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/03/29 18:19:19 pooka Exp $
+#
+
+TESTSDIR= ${TESTSBASE}/fs/union
+WARNS= 4
+
+TESTS_C= t_basic
+
+LDADD+= -lrumpfs_union -lrumpvfs_layerfs -lrumpfs_ffs # fs drivers
+LDADD+= -lrumpdev_disk -lrumpdev # disk device
+LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+
+.include <bsd.test.mk>
Index: src/tests/fs/union/t_basic.c
diff -u /dev/null src/tests/fs/union/t_basic.c:1.1
--- /dev/null Mon Mar 29 18:19:19 2010
+++ src/tests/fs/union/t_basic.c Mon Mar 29 18:19:19 2010
@@ -0,0 +1,137 @@
+/* $NetBSD: t_basic.c,v 1.1 2010/03/29 18:19:19 pooka Exp $ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <miscfs/union/union.h>
+#include <ufs/ufs/ufsmount.h>
+
+#define USE_ATF
+#include "../../h_macros.h"
+
+#ifdef USE_ATF
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "basic union functionality: two views");
+}
+#else
+#define atf_tc_fail(a, ...) errx(1, __VA_ARGS__)
+#endif
+
+#define MSTR "magic bus"
+
+static void
+xput_tfile(const char *path)
+{
+ int fd;
+
+ fd = rump_sys_open(path, O_CREAT | O_RDWR, 0777);
+ if (fd == -1)
+ atf_tc_fail_errno("create %s", path);
+ if (rump_sys_write(fd, MSTR, sizeof(MSTR)) != sizeof(MSTR))
+ atf_tc_fail_errno("write to testfile");
+ rump_sys_close(fd);
+}
+
+static int
+xread_tfile(const char *path)
+{
+ char buf[128];
+ int fd;
+
+ fd = rump_sys_open(path, O_RDONLY);
+ if (fd == -1)
+ return errno;
+ if (rump_sys_read(fd, buf, sizeof(buf)) == -1)
+ atf_tc_fail_errno("read tfile");
+ rump_sys_close(fd);
+ if (strcmp(buf, MSTR) == 0)
+ return 0;
+ return EPROGMISMATCH;
+}
+
+#define IMG1 "atf1.img"
+#define IMG2 "atf2.img"
+#define DEV1 "/dev/fs1"
+#define DEV2 "/dev/fs2"
+#define newfs_base "newfs -F -s 10000 "
+
+#ifdef USE_ATF
+ATF_TC_BODY(basic, tc)
+#else
+int main(int argc, char *argv[])
+#endif
+{
+ struct ufs_args args;
+ struct union_args unionargs;
+ int error;
+
+ if (system(newfs_base IMG1) == -1)
+ atf_tc_fail_errno("create img1");
+ if (system(newfs_base IMG2) == -1)
+ atf_tc_fail_errno("create img2");
+
+ rump_init();
+ rump_pub_etfs_register(DEV1, IMG1, RUMP_ETFS_BLK);
+ rump_pub_etfs_register(DEV2, IMG2, RUMP_ETFS_BLK);
+
+ if (rump_sys_mkdir("/mp1", 0777) == -1)
+ atf_tc_fail_errno("mp1");
+ if (rump_sys_mkdir("/mp2", 0777) == -1)
+ atf_tc_fail_errno("mp1");
+
+ memset(&args, 0, sizeof(args));
+ args.fspec = __UNCONST(DEV1);
+ if (rump_sys_mount(MOUNT_FFS, "/mp1", 0, &args, sizeof(args)) == -1)
+ atf_tc_fail_errno("could not mount ffs1");
+
+ memset(&args, 0, sizeof(args));
+ args.fspec = __UNCONST(DEV2);
+ if (rump_sys_mount(MOUNT_FFS, "/mp2", 0, &args, sizeof(args)) == -1)
+ atf_tc_fail_errno("could not mount tmpfs2");
+
+ xput_tfile("/mp1/tensti");
+ memset(&unionargs, 0, sizeof(unionargs));
+
+ unionargs.target = __UNCONST("/mp1");
+ unionargs.mntflags = UNMNT_BELOW;
+
+ if (rump_sys_mount(MOUNT_UNION, "/mp2", 0,
+ &unionargs, sizeof(unionargs)) == -1)
+ atf_tc_fail_errno("union mount");
+
+ /* first, test we can read the old file from the new namespace */
+ error = xread_tfile("/mp2/tensti");
+ if (error != 0)
+ atf_tc_fail("union compare failed: %d (%s)",
+ error, strerror(error));
+
+ /* then, test upper layer writes don't affect the lower layer */
+ xput_tfile("/mp2/kiekko");
+ if ((error = xread_tfile("/mp1/kiekko")) != ENOENT)
+ atf_tc_fail("invisibility failed: %d (%s)",
+ error, strerror(error));
+
+ /* unmount etc. yaddayadda if non-lazy */
+}
+
+#ifdef USE_ATF
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, basic);
+ return 0; /*XXX?*/
+}
+#endif
