svn commit: r277443 - in stable/10: contrib/netbsd-tests/lib/libc/c063 lib/libc/tests/c063

[Garrett Cooper]

Author: ngie
Date: Tue Jan 20 21:48:42 2015
New Revision: 277443
URL: https://svnweb.freebsd.org/changeset/base/277443

Log:
  MFC r276590:
  
  r276590 (by jilles):
  
    Link lib/libc/c063 tests to the build.
  
    Some files lack required #include <sys/stat.h>. The #ifdef is per ngie's
    request; the includes are clearly necessary for struct stat.
  
    The faccessat test fails because it tries to use AT_SYMLINK_NOFOLLOW with
    faccessat(), which is not specified by POSIX.1-2008.
  
    Differential Revision:	https://reviews.freebsd.org/D1411
    Reviewed by:	ngie

Modified:
  stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
  stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
  stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
  stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
  stable/10/lib/libc/tests/c063/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c	Tue Jan 20 21:46:04 2015	(r277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c	Tue Jan 20 21:48:42 2015	(r277443)
@@ -165,6 +165,9 @@ ATF_TC_BODY(faccessat_fdlink, tc)
 	ATF_REQUIRE(faccessat(dfd, BASELINK, F_OK, 0) == -1);
 	ATF_REQUIRE(errno == ENOENT);
 
+#ifdef __FreeBSD__
+	atf_tc_expect_fail("Depends on non-standard behavior not mentioned in POSIX.1-2008");
+#endif
 	ATF_REQUIRE(faccessat(dfd, BASELINK, F_OK, AT_SYMLINK_NOFOLLOW) == 0);
 
 	ATF_REQUIRE(close(dfd) == 0);

Modified: stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c	Tue Jan 20 21:46:04 2015	(r277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c	Tue Jan 20 21:48:42 2015	(r277443)
@@ -40,6 +40,9 @@ __RCSID("$NetBSD: t_fchmodat.c,v 1.2 201
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fchmodat"

Modified: stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c	Tue Jan 20 21:46:04 2015	(r277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c	Tue Jan 20 21:48:42 2015	(r277443)
@@ -41,6 +41,9 @@ __RCSID("$NetBSD: t_fchownat.c,v 1.3 201
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fchownat"

Modified: stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c	Tue Jan 20 21:46:04 2015	(r277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c	Tue Jan 20 21:48:42 2015	(r277443)
@@ -40,6 +40,9 @@ __RCSID("$NetBSD: t_fstatat.c,v 1.2 2013
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fstatat"

Modified: stable/10/lib/libc/tests/c063/Makefile
==============================================================================
--- stable/10/lib/libc/tests/c063/Makefile	Tue Jan 20 21:46:04 2015	(r277442)
+++ stable/10/lib/libc/tests/c063/Makefile	Tue Jan 20 21:48:42 2015	(r277443)
@@ -4,21 +4,23 @@ TESTSDIR=	${TESTSBASE}/lib/libc/c063
 
 #TODO: t_o_search, t_utimensat
 
-NETBSD_ATF_TESTS_C=	t_faccessat
-NETBSD_ATF_TESTS_C+=	t_fchmodat
-NETBSD_ATF_TESTS_C+=	t_fchownat
-NETBSD_ATF_TESTS_C+=	t_fexecve
-NETBSD_ATF_TESTS_C+=	t_fstatat
-NETBSD_ATF_TESTS_C+=	t_linkat
-NETBSD_ATF_TESTS_C+=	t_mkdirat
-NETBSD_ATF_TESTS_C+=	t_mkfifoat
-NETBSD_ATF_TESTS_C+=	t_mknodat
-NETBSD_ATF_TESTS_C+=	t_openat
-NETBSD_ATF_TESTS_C+=	t_readlinkat
-NETBSD_ATF_TESTS_C+=	t_renameat
-NETBSD_ATF_TESTS_C+=	t_symlinkat
-NETBSD_ATF_TESTS_C+=	t_unlinkat
+NETBSD_ATF_TESTS_C=	faccessat
+NETBSD_ATF_TESTS_C+=	fchmodat
+NETBSD_ATF_TESTS_C+=	fchownat
+NETBSD_ATF_TESTS_C+=	fexecve
+NETBSD_ATF_TESTS_C+=	fstatat
+NETBSD_ATF_TESTS_C+=	linkat
+NETBSD_ATF_TESTS_C+=	mkdirat
+NETBSD_ATF_TESTS_C+=	mkfifoat
+NETBSD_ATF_TESTS_C+=	mknodat
+NETBSD_ATF_TESTS_C+=	openat
+NETBSD_ATF_TESTS_C+=	readlinkat
+NETBSD_ATF_TESTS_C+=	renameat
+NETBSD_ATF_TESTS_C+=	symlinkat
+NETBSD_ATF_TESTS_C+=	unlinkat
 
 CFLAGS+= -D_INCOMPLETE_XOPEN_C063
 
+.include "../Makefile.netbsd-tests"
+
 .include <bsd.test.mk>