MFC r305358,r305449,r305451,r306367,r306397,r309474:

This also contains a merge of ^/projects/netbsd-tests-update-12@r304035 .
This change never hit ^/head because bin/cat's behavior was changed (on ^/head)
to match NetBSD.

PR:	210607

r305358:

Update contrib/netbsd-tests with new content from NetBSD

This updates the snapshot from 09/30/2014 to 08/11/2016

This brings in a number of new testcases from upstream, most
notably:

- bin/cat
- lib/libc
- lib/msun
- lib/libthr
- usr.bin/sort

lib/libc/tests/stdio/open_memstream_test.c was moved to
lib/libc/tests/stdio/open_memstream2_test.c to accomodate
the new open_memstream test from NetBSD.

Tested on:	amd64 (VMware fusion VM; various bare metal platforms); i386 (VMware fusion VM); make tinderbox

r305449:

Install h_db to unbreak some of the lib/libc/db testcases after
r305358

r305451:

Fix lib/libc/rpc test assumptions added in r305358

- Require root in the tcp/udp subtests (it's needed on FreeBSD when
  registering services).
- Skip the tests if service registration fails.

r306367 (by br):

Allow up to 6 arguments only on MIPS.

r306397 (by br):

Use right piece of code for FreeBSD.

r309474:

Don't build :strvis_locale if VIS_NOLOCALE is undefined

The copy of contrib/libc-vis on ^/stable/10 doesn't contain all of the features
in the ^/stable/11 // ^/head version, including VIS_NOLOCALE. The risk is lower
in conditionally running the test instead of backporting the newer version of
libc-vis

1 files changed, 69 insertions, 6 deletions

diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c b/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c
index 47afb84..8db7880 100644
--- a/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c
+++ b/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_posix_memalign.c,v 1.2 2011/07/07 11:12:18 jruoho Exp $ */
+/*	$NetBSD: t_posix_memalign.c,v 1.4 2015/11/07 17:35:31 nros Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,11 +32,12 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_posix_memalign.c,v 1.2 2011/07/07 11:12:18 jruoho Exp $");
+__RCSID("$NetBSD: t_posix_memalign.c,v 1.4 2015/11/07 17:35:31 nros Exp $");
 
 #include <atf-c.h>
 
 #include <errno.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,10 +50,10 @@ ATF_TC_HEAD(posix_memalign_basic, tc)
 }
 ATF_TC_BODY(posix_memalign_basic, tc)
 {
-	size_t size[] = {
+	static const size_t size[] = {
 		1, 2, 3, 4, 10, 100, 16384, 32768, 65536
 	};
-	size_t align[] = {
+	static const size_t align[] = {
 		512, 1024, 16, 32, 64, 4, 2048, 16, 2
 	};
 
@@ -63,7 +64,7 @@ ATF_TC_BODY(posix_memalign_basic, tc)
 		int ret;
 		p = (void*)0x1;
 
-		(void)printf("Checking posix_memalign(&p, %zd, %zd)...\n",
+		(void)printf("Checking posix_memalign(&p, %zu, %zu)...\n",
 			align[i], size[i]);
 		ret = posix_memalign(&p, align[i], size[i]);
 
@@ -80,9 +81,71 @@ ATF_TC_BODY(posix_memalign_basic, tc)
 	}
 }
 
+
+ATF_TC(aligned_alloc_basic);
+ATF_TC_HEAD(aligned_alloc_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Checks aligned_alloc(3)");
+}
+ATF_TC_BODY(aligned_alloc_basic, tc)
+{
+	static const size_t size[] = {
+		1, 2, 3, 4, 10, 100, 16384, 32768, 65536, 10000, 0
+	};
+	static const size_t align[] = {
+		512, 1024, 16, 32, 64, 4, 2048, 16, 2, 2048, 0
+	};
+
+	size_t i;
+	void *p;
+
+	for (i = 0; i < __arraycount(size); i++) {
+		(void)printf("Checking aligned_alloc(%zu, %zu)...\n",
+		    align[i], size[i]);
+		p = aligned_alloc(align[i], size[i]);
+                if (p == NULL) {
+			if (align[i] == 0 || ((align[i] - 1) & align[i]) != 0 ||
+			    size[i] % align[i] != 0) {
+				ATF_REQUIRE_EQ_MSG(errno, EINVAL,
+				    "aligned_alloc: %s", strerror(errno));
+			}
+			else {
+				ATF_REQUIRE_EQ_MSG(errno, ENOMEM,
+				    "aligned_alloc: %s", strerror(errno));
+			}
+                }
+		else {
+			ATF_REQUIRE_EQ_MSG(align[i] == 0, false,
+			    "aligned_alloc: success when alignment was not "
+			    "a power of 2");
+			ATF_REQUIRE_EQ_MSG((align[i] - 1) & align[i], 0,
+			    "aligned_alloc: success when alignment was not "
+			    "a power of 2");
+#ifdef __NetBSD__
+			/*
+			 * NetBSD-specific invariant
+			 *
+			 * From aligned_alloc(3) on FreeBSD:
+			 *
+			 * Behavior is undefined if size is not an integral
+			 * multiple of alignment.
+			 */
+			ATF_REQUIRE_EQ_MSG(size[i] % align[i], 0,
+			    "aligned_alloc: success when size was not an "
+			    "integer multiple of alignment");
+#endif
+			ATF_REQUIRE_EQ_MSG(((intptr_t)p) & (align[i] - 1), 0,
+			    "p = %p", p);
+			free(p);
+		}
+	}
+}
+
+
 ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, posix_memalign_basic);
-
+        ATF_TP_ADD_TC(tp, aligned_alloc_basic);
+	
 	return atf_no_error();
 }