Module Name: src
Committed By: pooka
Date: Fri Jan 7 12:01:11 UTC 2011
Modified Files:
src/tests/fs/vfs: t_vfsops.c
Log Message:
use X-fs.mntname for f_fstypename. ignore p2k_ffs there.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/vfs/t_vfsops.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/vfs/t_vfsops.c
diff -u src/tests/fs/vfs/t_vfsops.c:1.8 src/tests/fs/vfs/t_vfsops.c:1.9
--- src/tests/fs/vfs/t_vfsops.c:1.8 Fri Nov 19 17:46:02 2010
+++ src/tests/fs/vfs/t_vfsops.c Fri Jan 7 12:01:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vfsops.c,v 1.8 2010/11/19 17:46:02 pooka Exp $ */
+/* $NetBSD: t_vfsops.c,v 1.9 2011/01/07 12:01:11 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -51,14 +51,14 @@
static void
tstatvfs(const atf_tc_t *tc, const char *path)
{
- const char *fstype = atf_tc_get_md_var(tc, "X-fs.type");
+ const char *fstype = atf_tc_get_md_var(tc, "X-fs.mntname");
struct statvfs svb;
if (rump_sys_statvfs1(path, &svb, ST_WAIT) == -1)
atf_tc_fail_errno("statvfs");
ATF_REQUIRE(svb.f_namemax > 0 && svb.f_namemax <= MAXNAMLEN);
- if (!FSTYPE_PUFFS(tc))
+ if (!(FSTYPE_PUFFS(tc) || FSTYPE_P2K_FFS(tc)))
ATF_REQUIRE_STREQ(svb.f_fstypename, fstype);
ATF_REQUIRE_STREQ(svb.f_mntonname, path);
}
