diff options
author | ngie <ngie@FreeBSD.org> | 2017-02-10 01:13:12 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-02-10 01:13:12 +0000 |
commit | 8864cde3495dbfd6b476c1b77a8bde035e1cf000 (patch) | |
tree | da558c97672e3d32f9e5551cd2daccd8684c5f03 /bin | |
parent | 9c6235cf2af8bdadcd0f0a80288683f0c88f3e55 (diff) | |
download | FreeBSD-src-8864cde3495dbfd6b476c1b77a8bde035e1cf000.zip FreeBSD-src-8864cde3495dbfd6b476c1b77a8bde035e1cf000.tar.gz |
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
Diffstat (limited to 'bin')
-rw-r--r-- | bin/cat/tests/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile index f68513c..8ac1ffb 100644 --- a/bin/cat/tests/Makefile +++ b/bin/cat/tests/Makefile @@ -4,9 +4,17 @@ NETBSD_ATF_TESTS_SH= cat_test FILESDIR= ${TESTSDIR} -FILES= d_align.in +FILES+= d_align.in FILES+= d_align.out +FILES+= d_se_output.in +FILES+= d_se_output.out .include <netbsd-tests.test.mk> +d_align.out: ${TESTSRC}/d_align.out + sed -E -e 's,^[[:space:]]{7}\$$$$,\$$,' < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= d_align.out d_align.out.tmp + .include <bsd.test.mk> |