Module Name: src
Committed By: pooka
Date: Tue Jun 29 15:25:28 UTC 2010
Modified Files:
src/tests/fs/union: Makefile
Added Files:
src/tests/fs/union: t_pr.c
Log Message:
xfail test for problem described in PR kern/23986
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/union/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/union/t_pr.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/union/Makefile
diff -u src/tests/fs/union/Makefile:1.1 src/tests/fs/union/Makefile:1.2
--- src/tests/fs/union/Makefile:1.1 Mon Mar 29 18:19:19 2010
+++ src/tests/fs/union/Makefile Tue Jun 29 15:25:28 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/03/29 18:19:19 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/29 15:25:28 pooka Exp $
#
TESTSDIR= ${TESTSBASE}/fs/union
WARNS= 4
-TESTS_C= t_basic
+TESTS_C= t_basic t_pr
LDADD+= -lrumpfs_union -lrumpvfs_layerfs -lrumpfs_ffs # fs drivers
LDADD+= -lrumpdev_disk -lrumpdev # disk device
Added files:
Index: src/tests/fs/union/t_pr.c
diff -u /dev/null src/tests/fs/union/t_pr.c:1.1
--- /dev/null Tue Jun 29 15:25:28 2010
+++ src/tests/fs/union/t_pr.c Tue Jun 29 15:25:28 2010
@@ -0,0 +1,79 @@
+/* $NetBSD: t_pr.c,v 1.1 2010/06/29 15:25:28 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>
+
+#include "../../h_macros.h"
+
+ATF_TC(multilayer);
+ATF_TC_HEAD(multilayer, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "mount_union -b twice");
+ atf_tc_set_md_var(tc, "use.fs", "true");
+ atf_tc_set_md_var(tc, "xfail", "PR kern/23986");
+}
+
+#define IMG1 "atf1.img"
+#define DEV1 "/dev/fs1"
+#define newfs_base "newfs -F -s 10000 "
+
+ATF_TC_BODY(multilayer, tc)
+{
+ struct ufs_args args;
+ struct union_args unionargs;
+
+ if (system(newfs_base IMG1) == -1)
+ atf_tc_fail_errno("create img1");
+
+ rump_init();
+ rump_pub_etfs_register(DEV1, IMG1, RUMP_ETFS_BLK);
+
+ memset(&args, 0, sizeof(args));
+ args.fspec = __UNCONST(DEV1);
+ if (rump_sys_mount(MOUNT_FFS, "/", 0, &args, sizeof(args)) == -1)
+ atf_tc_fail_errno("could not mount root");
+
+ if (rump_sys_mkdir("/Tunion", 0777) == -1)
+ atf_tc_fail_errno("mkdir mp1");
+ if (rump_sys_mkdir("/Tunion2", 0777) == -1)
+ atf_tc_fail_errno("mkdir mp2");
+ if (rump_sys_mkdir("/Tunion2/A", 0777) == -1)
+ atf_tc_fail_errno("mkdir A");
+ if (rump_sys_mkdir("/Tunion2/B", 0777) == -1)
+ atf_tc_fail_errno("mkdir B");
+
+ unionargs.target = __UNCONST("/Tunion2/A");
+ unionargs.mntflags = UNMNT_BELOW;
+
+ if (rump_sys_mount(MOUNT_UNION, "/Tunion", 0,
+ &unionargs, sizeof(unionargs)) == -1)
+ atf_tc_fail_errno("union mount");
+
+ unionargs.target = __UNCONST("/Tunion2/B");
+ unionargs.mntflags = UNMNT_BELOW;
+
+ /* BADABOOM */
+ rump_sys_mount(MOUNT_UNION, "/Tunion", 0,&unionargs,sizeof(unionargs));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, multilayer);
+
+ return atf_no_error();
+}
