Fri Jan 7 12:01:11 2011 UTC ()
use X-fs.mntname for f_fstypename.  ignore p2k_ffs there.


(pooka)
diff -r1.8 -r1.9 src/tests/fs/vfs/t_vfsops.c
cvs diff -r1.8 -r1.9 src/tests/fs/vfs/t_vfsops.c (expand / switch to unified diff)

--- src/tests/fs/vfs/t_vfsops.c 2010/11/19 17:46:02 1.8
+++ src/tests/fs/vfs/t_vfsops.c 2011/01/07 12:01:11 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_vfsops.c,v 1.8 2010/11/19 17:46:02 pooka Exp $ */ 1/* $NetBSD: t_vfsops.c,v 1.9 2011/01/07 12:01:11 pooka Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 The NetBSD Foundation, Inc. 4 * Copyright (c) 2010 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -41,34 +41,34 @@ @@ -41,34 +41,34 @@
41#include "../common/h_fsmacros.h" 41#include "../common/h_fsmacros.h"
42#include "../../h_macros.h" 42#include "../../h_macros.h"
43 43
44static void 44static void
45tmount(const atf_tc_t *tc, const char *path) 45tmount(const atf_tc_t *tc, const char *path)
46{ 46{
47 47
48 return; 48 return;
49} 49}
50 50
51static void 51static void
52tstatvfs(const atf_tc_t *tc, const char *path) 52tstatvfs(const atf_tc_t *tc, const char *path)
53{ 53{
54 const char *fstype = atf_tc_get_md_var(tc, "X-fs.type"); 54 const char *fstype = atf_tc_get_md_var(tc, "X-fs.mntname");
55 struct statvfs svb; 55 struct statvfs svb;
56 56
57 if (rump_sys_statvfs1(path, &svb, ST_WAIT) == -1) 57 if (rump_sys_statvfs1(path, &svb, ST_WAIT) == -1)
58 atf_tc_fail_errno("statvfs"); 58 atf_tc_fail_errno("statvfs");
59 59
60 ATF_REQUIRE(svb.f_namemax > 0 && svb.f_namemax <= MAXNAMLEN); 60 ATF_REQUIRE(svb.f_namemax > 0 && svb.f_namemax <= MAXNAMLEN);
61 if (!FSTYPE_PUFFS(tc)) 61 if (!(FSTYPE_PUFFS(tc) || FSTYPE_P2K_FFS(tc)))
62 ATF_REQUIRE_STREQ(svb.f_fstypename, fstype); 62 ATF_REQUIRE_STREQ(svb.f_fstypename, fstype);
63 ATF_REQUIRE_STREQ(svb.f_mntonname, path); 63 ATF_REQUIRE_STREQ(svb.f_mntonname, path);
64} 64}
65 65
66static void 66static void
67tsync(const atf_tc_t *tc, const char *path) 67tsync(const atf_tc_t *tc, const char *path)
68{ 68{
69 69
70 rump_sys_sync(); 70 rump_sys_sync();
71} 71}
72 72
73#define MAGICSTR "just a string, I like A" 73#define MAGICSTR "just a string, I like A"
74static void 74static void