Module Name:    src
Committed By:   pooka
Date:           Fri Jan  7 12:16:17 UTC 2011

Modified Files:
        src/tests/fs/common: h_fsmacros.h

Log Message:
Adjust atf_check_type() to make it work again.
Do we need tests for the tests? ;)


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/tests/fs/common/h_fsmacros.h

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/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.30 src/tests/fs/common/h_fsmacros.h:1.31
--- src/tests/fs/common/h_fsmacros.h:1.30	Fri Jan  7 12:00:34 2011
+++ src/tests/fs/common/h_fsmacros.h	Fri Jan  7 12:16:17 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: h_fsmacros.h,v 1.30 2011/01/07 12:00:34 pooka Exp $	*/
+/*	$NetBSD: h_fsmacros.h,v 1.31 2011/01/07 12:16:17 pooka Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@
 									\
 	ATF_TC_BODY(fs##_##func,tc)					\
 	{								\
-		if (!atf_check_fstype(tc, type))			\
+		if (!atf_check_fstype(tc, #fs))				\
 			atf_tc_skip("filesystem not selected");		\
 		FSTEST_CONSTRUCTOR(tc,fs,fs##func##tmp);		\
 		func(tc,FSTEST_MNTNAME);				\
@@ -124,7 +124,7 @@
 									\
 	ATF_TC_CLEANUP(fs##_##func,tc)					\
 	{								\
-		if (!atf_check_fstype(tc, type))			\
+		if (!atf_check_fstype(tc, #fs))				\
 			return;						\
 		if (fs##_fstest_delfs(tc, fs##func##tmp) != 0)		\
 			atf_tc_fail_errno("delfs failed");		\
@@ -142,7 +142,7 @@
 									\
 	ATF_TC_BODY(_fs_##_##_func_,tc)					\
 	{								\
-		if (!atf_check_fstype(tc, _type_))			\
+		if (!atf_check_fstype(tc, #_fs_))			\
 			atf_tc_skip("filesystem not selected");		\
 		FSTEST_CONSTRUCTOR(tc,_fs_,_fs_##_func_##tmp);		\
 		_gen_(tc,FSTEST_MNTNAME);				\
@@ -160,7 +160,7 @@
 									\
 	ATF_TC_CLEANUP(_fs_##_##_func_,tc)				\
 	{								\
-		if (!atf_check_fstype(tc, _type_))			\
+		if (!atf_check_fstype(tc, #_fs_))			\
 			return;						\
 		if (_fs_##_fstest_delfs(tc, _fs_##_func_##tmp) != 0)	\
 			atf_tc_fail_errno("delfs failed");		\

Reply via email to