Module Name: src
Committed By: pooka
Date: Wed Jan 12 17:16:24 UTC 2011
Modified Files:
src/tests/fs/union: t_basic.c
Log Message:
Simplify test: there's no reason to mount 2x ffs.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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/union/t_basic.c
diff -u src/tests/fs/union/t_basic.c:1.5 src/tests/fs/union/t_basic.c:1.6
--- src/tests/fs/union/t_basic.c:1.5 Sun Nov 7 17:51:18 2010
+++ src/tests/fs/union/t_basic.c Wed Jan 12 17:16:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.5 2010/11/07 17:51:18 jmmv Exp $ */
+/* $NetBSD: t_basic.c,v 1.6 2011/01/12 17:16:24 pooka Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -59,9 +59,7 @@
}
#define IMG1 "atf1.img"
-#define IMG2 "atf2.img"
#define DEV1 "/dev/fs1"
-#define DEV2 "/dev/fs2"
#define newfs_base "newfs -F -s 10000 "
ATF_TC_BODY(basic, tc)
@@ -72,12 +70,9 @@
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);
+ rump_pub_etfs_register(DEV1, IMG1, RUMP_ETFS_BLK);
if (rump_sys_mkdir("/mp1", 0777) == -1)
atf_tc_fail_errno("mp1");
@@ -89,11 +84,6 @@
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));
