CVS commit: src/tests/lib/libc/c063

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Jul 10 20:19:51 UTC 2024

Modified Files:
        src/tests/lib/libc/c063: t_fchmodat.c

Log Message:
correct test conditions.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/c063/t_fchmodat.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/lib/libc/c063/t_fchmodat.c
diff -u src/tests/lib/libc/c063/t_fchmodat.c:1.5 src/tests/lib/libc/c063/t_fchmodat.c:1.6
--- src/tests/lib/libc/c063/t_fchmodat.c:1.5	Wed Jul 10 15:23:56 2024
+++ src/tests/lib/libc/c063/t_fchmodat.c	Wed Jul 10 16:19:51 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_fchmodat.c,v 1.5 2024/07/10 19:23:56 rillig Exp $ */
+/*	$NetBSD: t_fchmodat.c,v 1.6 2024/07/10 20:19:51 christos Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fchmodat.c,v 1.5 2024/07/10 19:23:56 rillig Exp $");
+__RCSID("$NetBSD: t_fchmodat.c,v 1.6 2024/07/10 20:19:51 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -49,6 +49,11 @@ __RCSID("$NetBSD: t_fchmodat.c,v 1.5 202
 #define BASELINK "symlink"
 #define FILEERR "dir/fchmodaterr"
 
+#define modecheck(a, b) \
+	ATF_REQUIRE_MSG(((a) & ALLPERMS) == (b), \
+	    "Incorrect mode found %#o != expected%#o", \
+	    ((a) & ALLPERMS), (b));
+
 ATF_TC(fchmodat_fd);
 ATF_TC_HEAD(fchmodat_fd, tc)
 {
@@ -69,7 +74,7 @@ ATF_TC_BODY(fchmodat_fd, tc)
 	ATF_REQUIRE(close(dfd) == 0);
 
 	ATF_REQUIRE(stat(FILE, &st) == 0);
-	ATF_REQUIRE(st.st_mode == 0600);
+	modecheck(st.st_mode, 0600);
 }
 
 ATF_TC(fchmodat_fdcwd);
@@ -91,7 +96,7 @@ ATF_TC_BODY(fchmodat_fdcwd, tc)
 	ATF_REQUIRE(fchmodat(AT_FDCWD, BASEFILE, 0600, 0) == 0);
 
 	ATF_REQUIRE(stat(BASEFILE, &st) == 0);
-	ATF_REQUIRE(st.st_mode == 0600);
+	modecheck(st.st_mode, 0600);
 }
 
 ATF_TC(fchmodat_fdcwderr);
@@ -180,7 +185,7 @@ ATF_TC_BODY(fchmodat_fdlink, tc)
 	ATF_REQUIRE(close(dfdlink) == 0);
 
 	ATF_REQUIRE(lstat(LINK, &st) == 0);
-	ATF_REQUIRE(st.st_mode == 0600);
+	modecheck(st.st_mode, 0600);
 }
 
 ATF_TP_ADD_TCS(tp)