 @@ -1,14 +1,14 @@
-/*	$NetBSD: h_fsmacros.h,v 1.25 2011/01/07 10:45:45 pooka Exp $	*/
+/*	$NetBSD: h_fsmacros.h,v 1.26 2011/01/07 11:36:27 pooka Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nicolas Joly.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -123,27 +123,27 @@ do {									\
 	ATF_TC_CLEANUP(fs##_##func,tc)					\
 	{								\
 		if (!atf_check_fstype(tc, type))			\
 			return;						\
 		if (fs##_fstest_delfs(tc, fs##func##tmp) != 0)		\
 			atf_tc_fail_errno("delfs failed");		\
+	}
 #define ATF_TC_FSADD_RO(_fs_,_type_,_func_,_desc_,_gen_)		\
 	ATF_TC_WITH_CLEANUP(_fs_##_##_func_);				\
 	ATF_TC_HEAD(_fs_##_##_func_,tc)					\
 	{								\
 		atf_tc_set_md_var(tc, "descr",_type_" test for "_desc_);\
-		atf_tc_set_md_var(tc, "X-fs.type", _type_);		\
+		atf_tc_set_md_var(tc, "X-fs.type", #_fs_);		\
 	}								\
 	void *_fs_##_func_##tmp;					\
+									\
 	ATF_TC_BODY(_fs_##_##_func_,tc)					\
 	{								\
 		if (!atf_check_fstype(tc, _type_))			\
 			atf_tc_skip("filesystem not selected");		\
 		FSTEST_CONSTRUCTOR(tc,_fs_,_fs_##_func_##tmp);		\
 		_gen_(tc,FSTEST_MNTNAME);				\
 		if (_fs_##_fstest_unmount(tc, FSTEST_MNTNAME, 0) != 0)	\
 			atf_tc_fail_errno("unmount r/w failed");	\
 		if (_fs_##_fstest_mount(tc, _fs_##_func_##tmp,		\
 		    FSTEST_MNTNAME, MNT_RDONLY) != 0)			\
 @@ -230,43 +230,47 @@ atf_check_fstype(const atf_tc_t *tc, con
+{
 	const char *fstype;
 	if (!atf_tc_has_config_var(tc, "fstype"))
 		return true;
 	fstype = atf_tc_get_config_var(tc, "fstype");
 	if (strcmp(fstype, fs) == 0)
 		return true;
 	return false;
+}
 #define FSTYPE_EXT2FS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_EXT2FS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ext2fs") == 0)
 #define FSTYPE_FFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_FFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "ffs") == 0)
 #define FSTYPE_LFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_LFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "lfs") == 0)
 #define FSTYPE_MSDOS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_MSDOS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "msdosfs") == 0)
 #define FSTYPE_NFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_NFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "nfs") == 0)
 #define FSTYPE_NFSRO(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "nfsro") == 0)
 #define FSTYPE_P2K_FFS(tc)\
     (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "p2k_ffs") == 0)
 #define FSTYPE_PUFFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_PUFFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "puffs") == 0)
 #define FSTYPE_RUMPFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_RUMPFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "rumpfs") == 0)
 #define FSTYPE_SYSVBFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_SYSVBFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "sysvbfs") == 0)
 #define FSTYPE_TMPFS(tc)\
-    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_TMPFS) == 0)
+    (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "tmpfs") == 0)
 #define FSTEST_ENTER()							\
 	if (rump_sys_chdir(FSTEST_MNTNAME) == -1)			\
 		atf_tc_fail_errno("failed to cd into test mount")
 #define FSTEST_EXIT()							\
 	if (rump_sys_chdir("/") == -1)					\
 		atf_tc_fail_errno("failed to cd out of test mount")
 /*
  * file system args structures
  */