Date: Sat, 14 Jan 2017 09:38:40 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> 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 Message-ID: <201701140938.v0E9ce22080284@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <atf-c.h> -#ifdef __FreeBSD__ -#include <sys/socket.h> -#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 <unistd.h> #include <sysexits.h> -#ifdef __FreeBSD__ -#include <stdbool.h> -#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 <string.h> #include <unistd.h> -#ifdef __FreeBSD__ -#include <limits.h> -#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 <arpa/inet.h> #include <netinet/in.h> -#ifdef __FreeBSD__ -#include <sys/socket.h> -#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 <time.h> #include <unistd.h> -#ifdef __FreeBSD__ -#include <limits.h> -#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 <time.h> #include <unistd.h> -#ifdef __FreeBSD__ -#include <limits.h> -#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 <time.h> #include <unistd.h> -#ifdef __FreeBSD__ -#include <limits.h> -#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 <sched.h> #include <unistd.h> -#ifdef __FreeBSD__ -#include <err.h> -#include <stdio.h> -#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 <stdio.h> -#ifdef __FreeBSD__ -#include <netinet/in.h> -#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 <string.h> #include <unistd.h> -#ifdef __FreeBSD__ -#include <limits.h> -#endif - static const char path[] = "truncate"; static const size_t sizes[] = { 8, 16, 512, 1024, 2048, 4094, 3000, 30 };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701140938.v0E9ce22080284>