From 8864cde3495dbfd6b476c1b77a8bde035e1cf000 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 10 Feb 2017 01:13:12 +0000 Subject: 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 --- contrib/netbsd-tests/include/sys/t_cdefs.c | 116 ++++++++++++++--------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'contrib/netbsd-tests/include/sys/t_cdefs.c') diff --git a/contrib/netbsd-tests/include/sys/t_cdefs.c b/contrib/netbsd-tests/include/sys/t_cdefs.c index a473009..14f5cf2 100644 --- a/contrib/netbsd-tests/include/sys/t_cdefs.c +++ b/contrib/netbsd-tests/include/sys/t_cdefs.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_cdefs.c,v 1.3 2013/09/05 09:01:27 gsutre Exp $ */ +/* $NetBSD: t_cdefs.c,v 1.4 2016/03/16 07:21:36 mrg Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: t_cdefs.c,v 1.3 2013/09/05 09:01:27 gsutre Exp $"); +__RCSID("$NetBSD: t_cdefs.c,v 1.4 2016/03/16 07:21:36 mrg Exp $"); #include #include @@ -180,34 +180,34 @@ ATF_TC_HEAD(stypefit, tc) ATF_TC_BODY(stypefit, tc) { -#define CHECK(a, b, c) ATF_REQUIRE(!__type_fit(a, b) == c) - - CHECK(signed char, -1, 0); - CHECK(signed char, 1, 0); - CHECK(signed char, 0x7f, 0); - CHECK(signed char, 0x80, 1); - CHECK(signed char, 0xff, 1); - CHECK(signed char, 0x1ff, 1); - - CHECK(signed short, -1, 0); - CHECK(signed short, 1, 0); - CHECK(signed short, 0x7fff, 0); - CHECK(signed short, 0x8000, 1); - CHECK(signed short, 0xffff, 1); - CHECK(signed short, 0x1ffff, 1); - - CHECK(signed int, -1, 0); - CHECK(signed int, 1, 0); - CHECK(signed int, 0x7fffffff, 0); - CHECK(signed int, 0x80000000, 1); - CHECK(signed int, 0xffffffff, 1); - CHECK(signed int, 0x1ffffffffLL, 1); - - CHECK(signed long long, -1, 0); - CHECK(signed long long, 1, 0); - CHECK(signed long long, 0x7fffffffffffffffLL, 0); - CHECK(signed long long, 0x8000000000000000LL, 1); - CHECK(signed long long, 0xffffffffffffffffLL, 1); +#define CHECK(a, b, c) ATF_REQUIRE(__type_fit(a, b) == c) + + CHECK(signed char, -1, 1); + CHECK(signed char, 1, 1); + CHECK(signed char, 0x7f, 1); + CHECK(signed char, 0x80, 0); + CHECK(signed char, 0xff, 0); + CHECK(signed char, 0x1ff, 0); + + CHECK(signed short, -1, 1); + CHECK(signed short, 1, 1); + CHECK(signed short, 0x7fff, 1); + CHECK(signed short, 0x8000, 0); + CHECK(signed short, 0xffff, 0); + CHECK(signed short, 0x1ffff, 0); + + CHECK(signed int, -1, 1); + CHECK(signed int, 1, 1); + CHECK(signed int, 0x7fffffff, 1); + CHECK(signed int, 0x80000000, 0); + CHECK(signed int, 0xffffffff, 0); + CHECK(signed int, 0x1ffffffffLL, 0); + + CHECK(signed long long, -1, 1); + CHECK(signed long long, 1, 1); + CHECK(signed long long, 0x7fffffffffffffffLL, 1); + CHECK(signed long long, 0x8000000000000000LL, 0); + CHECK(signed long long, 0xffffffffffffffffLL, 0); #undef CHECK } @@ -220,34 +220,34 @@ ATF_TC_HEAD(utypefit, tc) ATF_TC_BODY(utypefit, tc) { -#define CHECK(a, b, c) ATF_REQUIRE(!__type_fit(a, b) == c) - - CHECK(unsigned char, -1, 1); - CHECK(unsigned char, 1, 0); - CHECK(unsigned char, 0x7f, 0); - CHECK(unsigned char, 0x80, 0); - CHECK(unsigned char, 0xff, 0); - CHECK(unsigned char, 0x1ff, 1); - - CHECK(unsigned short, -1, 1); - CHECK(unsigned short, 1, 0); - CHECK(unsigned short, 0x7fff, 0); - CHECK(unsigned short, 0x8000, 0); - CHECK(unsigned short, 0xffff, 0); - CHECK(unsigned short, 0x1ffff, 1); - - CHECK(unsigned int, -1, 1); - CHECK(unsigned int, 1, 0); - CHECK(unsigned int, 0x7fffffff, 0); - CHECK(unsigned int, 0x80000000, 0); - CHECK(unsigned int, 0xffffffff, 0); - CHECK(unsigned int, 0x1ffffffffLL, 1); - - CHECK(unsigned long long, -1, 1); - CHECK(unsigned long long, 1, 0); - CHECK(unsigned long long, 0x7fffffffffffffffULL, 0); - CHECK(unsigned long long, 0x8000000000000000ULL, 0); - CHECK(unsigned long long, 0xffffffffffffffffULL, 0); +#define CHECK(a, b, c) ATF_REQUIRE(__type_fit(a, b) == c) + + CHECK(unsigned char, -1, 0); + CHECK(unsigned char, 1, 1); + CHECK(unsigned char, 0x7f, 1); + CHECK(unsigned char, 0x80, 1); + CHECK(unsigned char, 0xff, 1); + CHECK(unsigned char, 0x1ff, 0); + + CHECK(unsigned short, -1, 0); + CHECK(unsigned short, 1, 1); + CHECK(unsigned short, 0x7fff, 1); + CHECK(unsigned short, 0x8000, 1); + CHECK(unsigned short, 0xffff, 1); + CHECK(unsigned short, 0x1ffff, 0); + + CHECK(unsigned int, -1, 0); + CHECK(unsigned int, 1, 1); + CHECK(unsigned int, 0x7fffffff, 1); + CHECK(unsigned int, 0x80000000, 1); + CHECK(unsigned int, 0xffffffff, 1); + CHECK(unsigned int, 0x1ffffffffLL, 0); + + CHECK(unsigned long long, -1, 0); + CHECK(unsigned long long, 1, 1); + CHECK(unsigned long long, 0x7fffffffffffffffULL, 1); + CHECK(unsigned long long, 0x8000000000000000ULL, 1); + CHECK(unsigned long long, 0xffffffffffffffffULL, 1); #undef CHECK } -- cgit v1.1