Index: stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c
===================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c	(revision 277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_faccessat.c	(revision 277443)
@@ -1,185 +1,188 @@
 /*	$NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_faccessat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
 
 #define DIR "dir"
 #define FILE "dir/faccessat"
 #define BASEFILE "faccessat"
 #define LINK "dir/symlink"
 #define BASELINK "symlink"
 #define FILEERR "dir/faccessaterr"
 
 ATF_TC(faccessat_fd);
 ATF_TC_HEAD(faccessat_fd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that faccessat works with fd");
 }
 ATF_TC_BODY(faccessat_fd, tc)
 {
 	int dfd;
 	int fd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(faccessat(dfd, BASEFILE, F_OK, 0) == 0);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(faccessat_fdcwd);
 ATF_TC_HEAD(faccessat_fdcwd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 			  "See that faccessat works with fd as AT_FDCWD");
 }
 ATF_TC_BODY(faccessat_fdcwd, tc)
 {
 	int fd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(chdir(DIR) == 0);
 	ATF_REQUIRE(faccessat(AT_FDCWD, BASEFILE, F_OK, 0) == 0);
 }
 
 ATF_TC(faccessat_fdcwderr);
 ATF_TC_HEAD(faccessat_fdcwderr, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 		  "See that faccessat fails with fd as AT_FDCWD and bad path");
 }
 ATF_TC_BODY(faccessat_fdcwderr, tc)
 {
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(faccessat(AT_FDCWD, FILEERR, F_OK, 0) == -1);
 }
 
 ATF_TC(faccessat_fderr1);
 ATF_TC_HEAD(faccessat_fderr1, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that faccessat fail with bad path");
 }
 ATF_TC_BODY(faccessat_fderr1, tc)
 {
 	int dfd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(faccessat(dfd, FILEERR, F_OK, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(faccessat_fderr2);
 ATF_TC_HEAD(faccessat_fderr2, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that faccessat fails with bad fdat");
 }
 ATF_TC_BODY(faccessat_fderr2, tc)
 {
 	int dfd;
 	int fd;
 	char cwd[MAXPATHLEN];
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(faccessat(dfd, BASEFILE, F_OK, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(faccessat_fderr3);
 ATF_TC_HEAD(faccessat_fderr3, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that faccessat fails with fd as -1");
 }
 ATF_TC_BODY(faccessat_fderr3, tc)
 {
 	int fd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(faccessat(-1, FILE, F_OK, 0) == -1);
 }
 
 ATF_TC(faccessat_fdlink);
 ATF_TC_HEAD(faccessat_fdlink, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that faccessat works on symlink");
 }
 ATF_TC_BODY(faccessat_fdlink, tc)
 {
 	int dfd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* NB: FILE does not exists */
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 
 	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);
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, faccessat_fd);
 	ATF_TP_ADD_TC(tp, faccessat_fdcwd);
 	ATF_TP_ADD_TC(tp, faccessat_fdcwderr);
 	ATF_TP_ADD_TC(tp, faccessat_fderr1);
 	ATF_TP_ADD_TC(tp, faccessat_fderr2);
 	ATF_TP_ADD_TC(tp, faccessat_fderr3);
 	ATF_TP_ADD_TC(tp, faccessat_fdlink);
 
 	return atf_no_error();
 }
Index: stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c
===================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c	(revision 277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchmodat.c	(revision 277443)
@@ -1,197 +1,200 @@
 /*	$NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_fchmodat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fchmodat"
 #define BASEFILE "fchmodat"
 #define LINK "dir/symlink"
 #define BASELINK "symlink"
 #define FILEERR "dir/fchmodaterr"
 
 ATF_TC(fchmodat_fd);
 ATF_TC_HEAD(fchmodat_fd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchmodat works with fd");
 }
 ATF_TC_BODY(fchmodat_fd, tc)
 {
 	int dfd;
 	int fd;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fchmodat(dfd, BASEFILE, 0600, 0) == 0);
 	ATF_REQUIRE(close(dfd) == 0);
 
 	ATF_REQUIRE(stat(FILE, &st) == 0);
 	ATF_REQUIRE(st.st_mode = 0600);
 }
 
 ATF_TC(fchmodat_fdcwd);
 ATF_TC_HEAD(fchmodat_fdcwd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 			  "See that fchmodat works with fd as AT_FDCWD");
 }
 ATF_TC_BODY(fchmodat_fdcwd, tc)
 {
 	int fd;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(chdir(DIR) == 0);
 	ATF_REQUIRE(fchmodat(AT_FDCWD, BASEFILE, 0600, 0) == 0);
 
 	ATF_REQUIRE(stat(BASEFILE, &st) == 0);
 	ATF_REQUIRE(st.st_mode = 0600);
 }
 
 ATF_TC(fchmodat_fdcwderr);
 ATF_TC_HEAD(fchmodat_fdcwderr, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 		  "See that fchmodat fails with fd as AT_FDCWD and bad path");
 }
 ATF_TC_BODY(fchmodat_fdcwderr, tc)
 {
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(fchmodat(AT_FDCWD, FILEERR, 0600, 0) == -1);
 }
 
 ATF_TC(fchmodat_fderr1);
 ATF_TC_HEAD(fchmodat_fderr1, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchmodat fail with bad path");
 }
 ATF_TC_BODY(fchmodat_fderr1, tc)
 {
 	int dfd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fchmodat(dfd, FILEERR, 0600, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(fchmodat_fderr2);
 ATF_TC_HEAD(fchmodat_fderr2, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchmodat fails with bad fdat");
 }
 ATF_TC_BODY(fchmodat_fderr2, tc)
 {
 	int dfd;
 	int fd;
 	char cwd[MAXPATHLEN];
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fchmodat(dfd, BASEFILE, 0600, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(fchmodat_fderr3);
 ATF_TC_HEAD(fchmodat_fderr3, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchmodat fails with fd as -1");
 }
 ATF_TC_BODY(fchmodat_fderr3, tc)
 {
 	int fd;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(fchmodat(-1, FILE, 0600, 0) == -1);
 }
 
 ATF_TC(fchmodat_fdlink);
 ATF_TC_HEAD(fchmodat_fdlink, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchmodat works on symlink");
 }
 ATF_TC_BODY(fchmodat_fdlink, tc)
 {
 	int dfdlink;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(symlink(FILE, LINK) == 0);
 
 	ATF_REQUIRE((dfdlink = open(DIR, O_RDONLY, 0)) != -1);
 
 	ATF_REQUIRE(fchmodat(dfdlink, BASELINK, 0600, 0) == -1);
 	ATF_REQUIRE(errno = ENOENT);
 
 	ATF_REQUIRE(fchmodat(dfdlink, BASELINK, 0600, AT_SYMLINK_NOFOLLOW) == 0);
 
 	ATF_REQUIRE(close(dfdlink) == 0);
 
 	ATF_REQUIRE(lstat(LINK, &st) == 0);
 	ATF_REQUIRE(st.st_mode = 0600);
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, fchmodat_fd);
 	ATF_TP_ADD_TC(tp, fchmodat_fdcwd);
 	ATF_TP_ADD_TC(tp, fchmodat_fdcwderr);
 	ATF_TP_ADD_TC(tp, fchmodat_fderr1);
 	ATF_TP_ADD_TC(tp, fchmodat_fderr2);
 	ATF_TP_ADD_TC(tp, fchmodat_fderr3);
 	ATF_TP_ADD_TC(tp, fchmodat_fdlink);
 
 	return atf_no_error();
 }
Index: stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c
===================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c	(revision 277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_fchownat.c	(revision 277443)
@@ -1,247 +1,250 @@
 /*	$NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_fchownat.c,v 1.3 2013/03/17 04:46:06 jmmv Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fchownat"
 #define BASEFILE "fchownat"
 #define LINK "dir/symlink"
 #define BASELINK "symlink"
 #define FILEERR "dir/fchownaterr"
 #define USER "nobody"
 
 static int getuser(uid_t *, gid_t *);
 
 static int getuser(uid_t *uid, gid_t *gid)
 {
 	struct passwd *pw;
 
 	if ((pw = getpwnam(USER)) == NULL)
 		return -1;
 
 	*uid = pw->pw_uid;
 	*gid = pw->pw_gid;
 
 	return 0;
 }
 
 ATF_TC(fchownat_fd);
 ATF_TC_HEAD(fchownat_fd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchownat works with fd");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fd, tc)
 {
 	int dfd;
 	int fd;
 	uid_t uid;
 	gid_t gid;
 	struct stat st;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fchownat(dfd, BASEFILE, uid, gid, 0) == 0);
 	ATF_REQUIRE(close(dfd) == 0);
 
 	ATF_REQUIRE(stat(FILE, &st) == 0);
 	ATF_REQUIRE(st.st_uid == uid);
 	ATF_REQUIRE(st.st_gid == gid);
 }
 
 ATF_TC(fchownat_fdcwd);
 ATF_TC_HEAD(fchownat_fdcwd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 			  "See that fchownat works with fd as AT_FDCWD");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fdcwd, tc)
 {
 	int fd;
 	uid_t uid;
 	gid_t gid;
 	struct stat st;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(chdir(DIR) == 0);
 	ATF_REQUIRE(fchownat(AT_FDCWD, BASEFILE, uid, gid, 0) == 0);
 
 	ATF_REQUIRE(stat(BASEFILE, &st) == 0);
 	ATF_REQUIRE(st.st_uid == uid);
 	ATF_REQUIRE(st.st_gid == gid);
 }
 
 ATF_TC(fchownat_fdcwderr);
 ATF_TC_HEAD(fchownat_fdcwderr, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 		  "See that fchownat fails with fd as AT_FDCWD and bad path");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fdcwderr, tc)
 {
 	uid_t uid;
 	gid_t gid;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(fchownat(AT_FDCWD, FILEERR, uid, gid, 0) == -1);
 }
 
 ATF_TC(fchownat_fderr1);
 ATF_TC_HEAD(fchownat_fderr1, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchownat fail with bad path");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fderr1, tc)
 {
 	int dfd;
 	uid_t uid;
 	gid_t gid;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fchownat(dfd, FILEERR, uid, gid, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(fchownat_fderr2);
 ATF_TC_HEAD(fchownat_fderr2, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchownat fails with bad fdat");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fderr2, tc)
 {
 	int dfd;
 	int fd;
 	char cwd[MAXPATHLEN];
 	uid_t uid;
 	gid_t gid;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fchownat(dfd, BASEFILE, uid, gid, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(fchownat_fderr3);
 ATF_TC_HEAD(fchownat_fderr3, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchownat fails with fd as -1");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fderr3, tc)
 {
 	int fd;
 	uid_t uid;
 	gid_t gid;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(fchownat(-1, FILE, uid, gid, 0) == -1);
 }
 
 ATF_TC(fchownat_fdlink);
 ATF_TC_HEAD(fchownat_fdlink, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fchownat works on symlink");
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 ATF_TC_BODY(fchownat_fdlink, tc)
 {
 	int dfd;
 	uid_t uid;
 	gid_t gid;
 	struct stat st;
 
 	ATF_REQUIRE(getuser(&uid, &gid) == 0);
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* Target does not exists */
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 
 	ATF_REQUIRE(fchownat(dfd, BASELINK, uid, gid, 0) == -1);
 	ATF_REQUIRE(errno == ENOENT);
 
 	ATF_REQUIRE(fchownat(dfd, BASELINK, uid, gid,
 	    AT_SYMLINK_NOFOLLOW) == 0);
 
 	ATF_REQUIRE(close(dfd) == 0);
 
 	ATF_REQUIRE(lstat(LINK, &st) == 0);
 	ATF_REQUIRE(st.st_uid == uid);
 	ATF_REQUIRE(st.st_gid == gid);
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, fchownat_fd);
 	ATF_TP_ADD_TC(tp, fchownat_fdcwd);
 	ATF_TP_ADD_TC(tp, fchownat_fdcwderr);
 	ATF_TP_ADD_TC(tp, fchownat_fderr1);
 	ATF_TP_ADD_TC(tp, fchownat_fderr2);
 	ATF_TP_ADD_TC(tp, fchownat_fderr3);
 	ATF_TP_ADD_TC(tp, fchownat_fdlink);
 
 	return atf_no_error();
 }
Index: stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c
===================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c	(revision 277442)
+++ stable/10/contrib/netbsd-tests/lib/libc/c063/t_fstatat.c	(revision 277443)
@@ -1,196 +1,199 @@
 /*	$NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_fstatat.c,v 1.2 2013/03/17 04:46:06 jmmv Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
 
 #define DIR "dir"
 #define FILE "dir/fstatat"
 #define BASEFILE "fstatat"
 #define LINK "dir/symlink"
 #define BASELINK "symlink"
 #define FILEERR "dir/symlink"
 
 ATF_TC(fstatat_fd);
 ATF_TC_HEAD(fstatat_fd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fstatat works with fd");
 }
 ATF_TC_BODY(fstatat_fd, tc)
 {
 	int dfd;
 	int fd;
 	struct stat st1, st2;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fstatat(dfd, BASEFILE, &st1, 0) == 0);
 	ATF_REQUIRE(close(dfd) == 0);
 
 	ATF_REQUIRE(stat(FILE, &st2) == 0);
 	ATF_REQUIRE(memcmp(&st1, &st2, sizeof(st1)) == 0);
 }
 
 ATF_TC(fstatat_fdcwd);
 ATF_TC_HEAD(fstatat_fdcwd, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 			  "See that fstatat works with fd as AT_FDCWD");
 }
 ATF_TC_BODY(fstatat_fdcwd, tc)
 {
 	int fd;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(chdir(DIR) == 0);
 	ATF_REQUIRE(fstatat(AT_FDCWD, BASEFILE, &st, 0) == 0);
 }
 
 ATF_TC(fstatat_fdcwderr);
 ATF_TC_HEAD(fstatat_fdcwderr, tc)
 {
 	atf_tc_set_md_var(tc, "descr", 
 		  "See that fstatat fails with fd as AT_FDCWD and bad path");
 }
 ATF_TC_BODY(fstatat_fdcwderr, tc)
 {
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(fstatat(AT_FDCWD, FILEERR, &st, 0) == -1);
 }
 
 ATF_TC(fstatat_fderr1);
 ATF_TC_HEAD(fstatat_fderr1, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fstatat fail with bad path");
 }
 ATF_TC_BODY(fstatat_fderr1, tc)
 {
 	int dfd;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fstatat(dfd, FILEERR, &st, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(fstatat_fderr2);
 ATF_TC_HEAD(fstatat_fderr2, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fstatat fails with bad fdat");
 }
 ATF_TC_BODY(fstatat_fderr2, tc)
 {
 	int dfd;
 	int fd;
 	char cwd[MAXPATHLEN];
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE((dfd = open(getcwd(cwd, MAXPATHLEN), O_RDONLY, 0)) != -1);
 	ATF_REQUIRE(fstatat(dfd, BASEFILE, &st, 0) == -1);
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TC(fstatat_fderr3);
 ATF_TC_HEAD(fstatat_fderr3, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fstatat fails with fd as -1");
 }
 ATF_TC_BODY(fstatat_fderr3, tc)
 {
 	int fd;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE((fd = open(FILE, O_CREAT|O_RDWR, 0644)) != -1);
 	ATF_REQUIRE(close(fd) == 0);
 
 	ATF_REQUIRE(fstatat(-1, FILE, &st, 0) == -1);
 }
 
 ATF_TC(fstatat_fdlink);
 ATF_TC_HEAD(fstatat_fdlink, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "See that fstatat works on symlink");
 }
 ATF_TC_BODY(fstatat_fdlink, tc)
 {
 	int dfd;
 	struct stat st;
 
 	ATF_REQUIRE(mkdir(DIR, 0755) == 0);
 	ATF_REQUIRE(symlink(FILE, LINK) == 0); /* target does not exists */
 
 	ATF_REQUIRE((dfd = open(DIR, O_RDONLY, 0)) != -1);
 
 	ATF_REQUIRE(fstatat(dfd, BASELINK, &st, 0) == -1);
 	ATF_REQUIRE(errno == ENOENT);
 
 	ATF_REQUIRE(fstatat(dfd, BASELINK, &st, AT_SYMLINK_NOFOLLOW) == 0);
 
 	ATF_REQUIRE(close(dfd) == 0);
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, fstatat_fd);
 	ATF_TP_ADD_TC(tp, fstatat_fdcwd);
 	ATF_TP_ADD_TC(tp, fstatat_fdcwderr);
 	ATF_TP_ADD_TC(tp, fstatat_fderr1);
 	ATF_TP_ADD_TC(tp, fstatat_fderr2);
 	ATF_TP_ADD_TC(tp, fstatat_fderr3);
 	ATF_TP_ADD_TC(tp, fstatat_fdlink);
 
 	return atf_no_error();
 }
Index: stable/10/lib/libc/tests/c063/Makefile
===================================================================
--- stable/10/lib/libc/tests/c063/Makefile	(revision 277442)
+++ stable/10/lib/libc/tests/c063/Makefile	(revision 277443)
@@ -1,24 +1,26 @@
 # $FreeBSD$
 
 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>
Index: stable/10
===================================================================
--- stable/10	(revision 277442)
+++ stable/10	(revision 277443)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r276590