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/usr.bin/make/t_make.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'contrib/netbsd-tests/usr.bin/make/t_make.sh') diff --git a/contrib/netbsd-tests/usr.bin/make/t_make.sh b/contrib/netbsd-tests/usr.bin/make/t_make.sh index 70c3ead..42fd795 100755 --- a/contrib/netbsd-tests/usr.bin/make/t_make.sh +++ b/contrib/netbsd-tests/usr.bin/make/t_make.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_make.sh,v 1.6 2014/08/23 16:26:13 apb Exp $ +# $NetBSD: t_make.sh,v 1.7 2015/01/27 12:57:14 martin Exp $ # # Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc. # All rights reserved. @@ -31,6 +31,17 @@ run_and_check() local atfname="${1}"; shift local makename="${1}"; shift + # these tests fail since the backout of the patch in PR + # 49085 - adjust for more concrete PR if there is one + case ${makename} in + escape) atf_expect_fail "see PR toolchain/49085";; + impsrc) atf_expect_fail "see PR toolchain/49085";; + phony*) atf_expect_fail "see PR toolchain/49085";; + posix1) atf_expect_fail "see PR toolchain/49085";; + suffixes) atf_expect_fail "see PR toolchain/49085" + atf_fail "this uses up all memory and then fails";; + esac + local srcdir="$(atf_get_srcdir)" local testdir="$(atf_get_srcdir)/unit-tests" -- cgit v1.1