Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/fs/vfs use X-fs.mntname for f_fstypename. ignore p2k_...



details:   https://anonhg.NetBSD.org/src/rev/1682f989d7f8
branches:  trunk
changeset: 760553:1682f989d7f8
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Jan 07 12:01:11 2011 +0000

description:
use X-fs.mntname for f_fstypename.  ignore p2k_ffs there.

diffstat:

 tests/fs/vfs/t_vfsops.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 96bf407d2c45 -r 1682f989d7f8 tests/fs/vfs/t_vfsops.c
--- a/tests/fs/vfs/t_vfsops.c   Fri Jan 07 12:00:34 2011 +0000
+++ b/tests/fs/vfs/t_vfsops.c   Fri Jan 07 12:01:11 2011 +0000
@@ -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);
 }



Home | Main Index | Thread Index | Old Index