Module Name: src
Committed By: pooka
Date: Mon Mar 29 13:26:32 UTC 2010
Modified Files:
src/tests/fs/ffs: Atffile Makefile
Added Files:
src/tests/fs/ffs: t_fifos.c
Log Message:
regression test for fifos on ffs
XXX: same test apart for mount/unmount could be used on other
fifo-supporting file systems (r/w support required, though).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/ffs/Atffile
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/ffs/t_fifos.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/Atffile
diff -u src/tests/fs/ffs/Atffile:1.1 src/tests/fs/ffs/Atffile:1.2
--- src/tests/fs/ffs/Atffile:1.1 Wed Apr 8 12:08:17 2009
+++ src/tests/fs/ffs/Atffile Mon Mar 29 13:26:32 2010
@@ -1,6 +1,6 @@
Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/04/08 12:08:17 pooka Exp $"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.2 2010/03/29 13:26:32 pooka Exp $"
prop: test-suite = "NetBSD"
-tp: t_renamerace
+tp: t_*
Index: src/tests/fs/ffs/Makefile
diff -u src/tests/fs/ffs/Makefile:1.5 src/tests/fs/ffs/Makefile:1.6
--- src/tests/fs/ffs/Makefile:1.5 Sun Jan 31 14:30:22 2010
+++ src/tests/fs/ffs/Makefile Mon Mar 29 13:26:32 2010
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2010/01/31 14:30:22 mlelstv Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/29 13:26:32 pooka Exp $
#
TESTSDIR= ${TESTSBASE}/fs/ffs
WARNS= 4
TESTS_C= t_renamerace
+TESTS_C+= t_fifos
-LDADD+= -lrumpfs_ffs -lrumpdev_disk -lrumpdev -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+=-lrumpfs_ffs # ffs
+LDADD+=-lrumpdev_disk -lrumpdev # disk device
+LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet # fifos
+LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
.include <bsd.test.mk>
Added files:
Index: src/tests/fs/ffs/t_fifos.c
diff -u /dev/null src/tests/fs/ffs/t_fifos.c:1.1
--- /dev/null Mon Mar 29 13:26:32 2010
+++ src/tests/fs/ffs/t_fifos.c Mon Mar 29 13:26:32 2010
@@ -0,0 +1,173 @@
+/* $NetBSD: t_fifos.c,v 1.1 2010/03/29 13:26:32 pooka Exp $ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+/* for debugging */
+#define USE_ATF
+
+#ifdef USE_ATF
+#include "../../h_macros.h"
+
+ATF_TC_WITH_CLEANUP(fifos);
+ATF_TC_HEAD(fifos, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "test fifo support in ffs");
+ atf_tc_set_md_var(tc, "timeout", "5");
+}
+#else
+#include <err.h>
+#define atf_tc_fail_errno(a) err(1, a)
+#define atf_tc_fail(a, ...) err(1, a)
+#endif
+
+#define teststr1 "raving & drooling"
+#define teststr2 "haha, charade"
+
+static void *
+w1(void *arg)
+{
+ int fd;
+
+ fd = rump_sys_open("sheep", O_WRONLY);
+ if (fd == -1)
+ atf_tc_fail_errno("w1 open");
+ if (rump_sys_write(fd, teststr1, sizeof(teststr1)) != sizeof(teststr1))
+ atf_tc_fail_errno("w1 write");
+ rump_sys_close(fd);
+
+ return NULL;
+}
+
+static void *
+w2(void *arg)
+{
+ int fd;
+
+ fd = rump_sys_open("pigs", O_WRONLY);
+ if (fd == -1)
+ atf_tc_fail_errno("w2 open");
+ if (rump_sys_write(fd, teststr2, sizeof(teststr2)) != sizeof(teststr2))
+ atf_tc_fail_errno("w2 write");
+ rump_sys_close(fd);
+
+ return NULL;
+}
+
+static void *
+r1(void *arg)
+{
+ char buf[32];
+ int fd;
+
+ fd = rump_sys_open("sheep", O_RDONLY);
+ if (fd == -1)
+ atf_tc_fail_errno("r1 open");
+ if (rump_sys_read(fd, buf, sizeof(buf)) != sizeof(teststr1))
+ atf_tc_fail_errno("r1 read");
+ rump_sys_close(fd);
+
+ if (strcmp(teststr1, buf) != 0)
+ atf_tc_fail("got invalid str, %s vs. %s", buf, teststr1);
+
+ return NULL;
+}
+
+static void *
+r2(void *arg)
+{
+ char buf[32];
+ int fd;
+
+ fd = rump_sys_open("pigs", O_RDONLY);
+ if (fd == -1)
+ atf_tc_fail_errno("r2 open");
+ if (rump_sys_read(fd, buf, sizeof(buf)) != sizeof(teststr2))
+ atf_tc_fail_errno("r2 read");
+ rump_sys_close(fd);
+
+ if (strcmp(teststr2, buf) != 0)
+ atf_tc_fail("got invalid str, %s vs. %s", buf, teststr2);
+
+ return NULL;
+}
+
+#define IMGNAME "atf.img"
+
+const char *newfs = "newfs -F -s 10000 " IMGNAME;
+#define FAKEBLK "/dev/sp00ka"
+
+#ifdef USE_ATF
+ATF_TC_BODY(fifos, tc)
+#else
+int main(int argc, char *argv[])
+#endif
+{
+ struct ufs_args args;
+ pthread_t ptw1, ptw2, ptr1, ptr2;
+
+ if (system(newfs) == -1)
+ atf_tc_fail_errno("newfs failed");
+
+ memset(&args, 0, sizeof(args));
+ args.fspec = __UNCONST(FAKEBLK);
+
+ rump_init();
+ if (rump_sys_mkdir("/animals", 0777) == -1)
+ atf_tc_fail_errno("cannot create mountpoint");
+ rump_pub_etfs_register(FAKEBLK, IMGNAME, RUMP_ETFS_BLK);
+ if (rump_sys_mount(MOUNT_FFS, "/animals", 0, &args, sizeof(args))==-1)
+ atf_tc_fail_errno("rump_sys_mount failed");
+
+ /* create fifos */
+ if (rump_sys_chdir("/animals") == 1)
+ atf_tc_fail_errno("chdir");
+ if (rump_sys_mkfifo("pigs", S_IFIFO | 0777) == -1)
+ atf_tc_fail_errno("mknod1");
+ if (rump_sys_mkfifo("sheep", S_IFIFO | 0777) == -1)
+ atf_tc_fail_errno("mknod2");
+
+ pthread_create(&ptw1, NULL, w1, NULL);
+ pthread_create(&ptw2, NULL, w2, NULL);
+ pthread_create(&ptr1, NULL, r1, NULL);
+ pthread_create(&ptr2, NULL, r2, NULL);
+
+ pthread_join(ptw1, NULL);
+ pthread_join(ptw2, NULL);
+ pthread_join(ptr1, NULL);
+ pthread_join(ptr2, NULL);
+
+ if (rump_sys_chdir("/") == 1)
+ atf_tc_fail_errno("chdir");
+
+ if (rump_sys_unmount("/animals", 0) == -1)
+ atf_tc_fail_errno("unmount failed");
+}
+
+#ifdef USE_ATF
+ATF_TC_CLEANUP(fifos, tc)
+{
+
+ unlink(IMGNAME);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, fifos);
+ return 0;
+}
+#endif
