From owner-svn-src-projects@freebsd.org Sat Jan 14 09:38:42 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74441CAD18D for ; Sat, 14 Jan 2017 09:38:42 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BD721845; Sat, 14 Jan 2017 09:38:42 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0E9cfMx080295; Sat, 14 Jan 2017 09:38:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0E9ce22080284; Sat, 14 Jan 2017 09:38:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701140938.v0E9ce22080284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 14 Jan 2017 09:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312149 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2017 09:38:42 -0000 Author: ngie Date: Sat Jan 14 09:38:40 2017 New Revision: 312149 URL: https://svnweb.freebsd.org/changeset/base/312149 Log: Diff reduce with upstream by taking diff hunks that were contributed back Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_connect.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_dup.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_link.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_listen.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msync.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_stat.c projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_truncate.c Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_connect.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_connect.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_connect.c Sat Jan 14 09:38:40 2017 (r312149) @@ -37,10 +37,6 @@ #include -#ifdef __FreeBSD__ -#include -#endif - ATF_TC(connect_low_port); ATF_TC_HEAD(connect_low_port, tc) { Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_dup.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_dup.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_dup.c Sat Jan 14 09:38:40 2017 (r312149) @@ -46,10 +46,6 @@ __RCSID("$NetBSD: t_dup.c,v 1.9 2017/01/ #include #include -#ifdef __FreeBSD__ -#include -#endif - static char path[] = "dup"; #ifdef __NetBSD__ static void check_mode(bool, bool, bool); Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_link.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_link.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_link.c Sat Jan 14 09:38:40 2017 (r312149) @@ -42,10 +42,6 @@ __RCSID("$NetBSD: t_link.c,v 1.3 2017/01 #include #include -#ifdef __FreeBSD__ -#include -#endif - static const char *getpath(void); static char path[] = "link"; static const char *pathl; Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_listen.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_listen.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_listen.c Sat Jan 14 09:38:40 2017 (r312149) @@ -37,10 +37,6 @@ #include #include -#ifdef __FreeBSD__ -#include -#endif - static const char *path = "listen"; ATF_TC_WITH_CLEANUP(listen_err); Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c Sat Jan 14 09:38:40 2017 (r312149) @@ -47,10 +47,6 @@ __RCSID("$NetBSD: t_msgctl.c,v 1.5 2017/ #include #include -#ifdef __FreeBSD__ -#include -#endif - #define MSG_KEY 12345689 #define MSG_MTYPE_1 0x41 Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c Sat Jan 14 09:38:40 2017 (r312149) @@ -48,10 +48,6 @@ __RCSID("$NetBSD: t_msgrcv.c,v 1.4 2017/ #include #include -#ifdef __FreeBSD__ -#include -#endif - #define MSG_KEY 1234 #define MSG_MTYPE_1 0x41 #define MSG_MTYPE_2 0x42 Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c Sat Jan 14 09:38:40 2017 (r312149) @@ -48,10 +48,6 @@ __RCSID("$NetBSD: t_msgsnd.c,v 1.3 2017/ #include #include -#ifdef __FreeBSD__ -#include -#endif - #define MSG_KEY 1234 #define MSG_MTYPE_1 0x41 #define MSG_MTYPE_2 0x42 Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msync.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msync.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_msync.c Sat Jan 14 09:38:40 2017 (r312149) @@ -65,22 +65,33 @@ msync_sync(const char *garbage, int flag if (buf == NULL) return NULL; +#ifdef __FreeBSD__ + memset(buf, 'x', page); +#else for (i = 0; i < (size_t)page; i++) buf[i] = 'x'; +#endif fd = open(path, O_RDWR | O_CREAT, 0700); if (fd < 0) { +#ifdef __FreeBSD__ + free(buf); + return "failed to open"; +#else str = "failed to open"; goto out; +#endif } +#if __FreeBSD__ + (void)write(fd, buf, page); +#else tot = 0; while (tot < page) { rv = write(fd, buf, sizeof(buf)); - if (rv < 0) { str = "failed to write"; goto out; @@ -88,6 +99,7 @@ msync_sync(const char *garbage, int flag tot += rv; } +#endif map = mmap(NULL, page, PROT_READ | PROT_WRITE, MAP_FILE|MAP_PRIVATE, fd, 0); Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c Sat Jan 14 09:38:40 2017 (r312149) @@ -41,11 +41,6 @@ __RCSID("$NetBSD: t_sigqueue.c,v 1.7 201 #include #include -#ifdef __FreeBSD__ -#include -#include -#endif - static void handler(int, siginfo_t *, void *); #define VALUE (int)0xc001dad1 @@ -212,7 +207,6 @@ ATF_TC_BODY(sigqueue_rt, tc) if (sigaddset(&mask, signals[i]) == -1) warn("sigaddset"); - ATF_REQUIRE(sigprocmask(SIG_BLOCK, &mask, &orig) != -1); for (size_t i = 0; i < CNT; i++) @@ -222,7 +216,6 @@ ATF_TC_BODY(sigqueue_rt, tc) sleep(1); ATF_CHECK_MSG((size_t)count == ndelivered, "count %zu != ndelivered %zu", (size_t)count, ndelivered); - for (size_t i = 0; i < ndelivered; i++) ATF_REQUIRE_MSG(ordered[i] == delivered[i], "%zu: ordered %d != delivered %d", Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_stat.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_stat.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_stat.c Sat Jan 14 09:38:40 2017 (r312149) @@ -48,10 +48,6 @@ __RCSID("$NetBSD: t_stat.c,v 1.5 2017/01 #include -#ifdef __FreeBSD__ -#include -#endif - static const char *path = "stat"; ATF_TC_WITH_CLEANUP(stat_chflags); @@ -400,9 +396,6 @@ ATF_TC_BODY(stat_symlink, tc) (void)close(fd); ATF_REQUIRE(unlink(path) == 0); ATF_REQUIRE(unlink(pathlink) == 0); -#ifdef __FreeBSD__ - (void)close(fd); -#endif } ATF_TC_CLEANUP(stat_symlink, tc) Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_truncate.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_truncate.c Sat Jan 14 09:25:09 2017 (r312148) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/sys/t_truncate.c Sat Jan 14 09:38:40 2017 (r312149) @@ -41,10 +41,6 @@ __RCSID("$NetBSD: t_truncate.c,v 1.3 201 #include #include -#ifdef __FreeBSD__ -#include -#endif - static const char path[] = "truncate"; static const size_t sizes[] = { 8, 16, 512, 1024, 2048, 4094, 3000, 30 };