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, 11 insertions, 11 deletions

diff --git a/contrib/netbsd-tests/lib/libc/gen/t_randomid.c b/contrib/netbsd-tests/lib/libc/gen/t_randomid.c
index 8377806..9ab2cca 100644
--- a/contrib/netbsd-tests/lib/libc/gen/t_randomid.c
+++ b/contrib/netbsd-tests/lib/libc/gen/t_randomid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_randomid.c,v 1.3 2011/07/07 09:49:59 jruoho Exp $ */
+/* $NetBSD: t_randomid.c,v 1.5 2015/03/07 09:59:15 isaki Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #define	PERIOD		30000
 
-uint64_t last[65536];
+uint32_t last[65536];
 
 ATF_TC(randomid_basic);
 ATF_TC_HEAD(randomid_basic, tc)
@@ -50,30 +50,30 @@ ATF_TC_HEAD(randomid_basic, tc)
 ATF_TC_BODY(randomid_basic, tc)
 {
 	static randomid_t ctx = NULL;
-	uint64_t lowest, n, diff;
+	uint32_t lowest, n, diff;
 	uint16_t id;
 
 	memset(last, 0, sizeof(last));
 	ctx = randomid_new(16, (long)3600);
 
-	lowest = UINT64_MAX;
+	lowest = UINT32_MAX;
 
-	for (n = 0; n < 1000000; n++) {
+	for (n = 0; n < 100000; n++) {
 		id = randomid(ctx);
 
 		if (last[id] > 0) {
 			diff = n - last[id];
 
 			if (diff <= lowest) {
-				if (lowest != UINT64_MAX)
-					printf("id %5d: last call at %9"PRIu64
-					    ", current call %9"PRIu64
-					    " (diff %5"PRIu64"), "
-					    "lowest %"PRIu64"\n",
+				if (lowest != UINT32_MAX)
+					printf("id %5d: last call at %9"PRIu32
+					    ", current call %9"PRIu32
+					    " (diff %5"PRIu32"), "
+					    "lowest %"PRIu32"\n",
 					    id, last[id], n, diff, lowest);
 
 				ATF_REQUIRE_MSG(diff >= PERIOD,
-				    "diff (%"PRIu64") less than minimum "
+				    "diff (%"PRIu32") less than minimum "
 				    "period (%d)", diff, PERIOD);
 
 				lowest = diff;