CVS commit: src/tests/include

[Nicolas Joly]

Module Name:    src
Committed By:   njoly
Date:           Mon Jul 11 17:51:48 UTC 2011

Modified Files:
        src/tests/include: t_paths.c

Log Message:
Convert some more ATF_REQUIRE calls to ATF_CHECK.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/include/t_paths.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/include/t_paths.c
diff -u src/tests/include/t_paths.c:1.5 src/tests/include/t_paths.c:1.6
--- src/tests/include/t_paths.c:1.5	Mon Apr  4 19:59:08 2011
+++ src/tests/include/t_paths.c	Mon Jul 11 17:51:48 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_paths.c,v 1.5 2011/04/04 19:59:08 jruoho Exp $ */
+/*	$NetBSD: t_paths.c,v 1.6 2011/07/11 17:51:48 njoly Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_paths.c,v 1.5 2011/04/04 19:59:08 jruoho Exp $");
+__RCSID("$NetBSD: t_paths.c,v 1.6 2011/07/11 17:51:48 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -163,26 +163,26 @@
 			if (strcmp(paths[i].path, _PATH_BPF) == 0)
 				atf_tc_expect_fail("PR lib/44807");
 
-			ATF_REQUIRE(S_ISBLK(m) != 0 || S_ISCHR(m) != 0);
+			ATF_CHECK(S_ISBLK(m) != 0 || S_ISCHR(m) != 0);
 
-			ATF_REQUIRE((paths[i].flags & PATH_DIR) == 0);
-			ATF_REQUIRE((paths[i].flags & PATH_FILE) == 0);
+			ATF_CHECK((paths[i].flags & PATH_DIR) == 0);
+			ATF_CHECK((paths[i].flags & PATH_FILE) == 0);
 		}
 
 		if ((paths[i].flags & PATH_DIR) != 0) {
 
-			ATF_REQUIRE(S_ISDIR(m) != 0);
+			ATF_CHECK(S_ISDIR(m) != 0);
 
-			ATF_REQUIRE((paths[i].flags & PATH_DEV) == 0);
-			ATF_REQUIRE((paths[i].flags & PATH_FILE) == 0);
+			ATF_CHECK((paths[i].flags & PATH_DEV) == 0);
+			ATF_CHECK((paths[i].flags & PATH_FILE) == 0);
 		}
 
 		if ((paths[i].flags & PATH_FILE) != 0) {
 
-			ATF_REQUIRE(S_ISREG(m) != 0);
+			ATF_CHECK(S_ISREG(m) != 0);
 
-			ATF_REQUIRE((paths[i].flags & PATH_DEV) == 0);
-			ATF_REQUIRE((paths[i].flags & PATH_DIR) == 0);
+			ATF_CHECK((paths[i].flags & PATH_DEV) == 0);
+			ATF_CHECK((paths[i].flags & PATH_DIR) == 0);
 		}
 
 		ATF_REQUIRE(close(fd) == 0);