diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-07 01:52:56 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-07 01:52:56 +0000 |
| commit | 10b87d8ba3ff12dbc34b3c1d99e89f4383fc98c3 (patch) | |
| tree | 9c82bf5ded885bafb240ccc56f48e06efbf594be /lib | |
| parent | 6a26a03ab521df8ace37d7a8ab9af6479c2959c6 (diff) | |
| download | FreeBSD-src-10b87d8ba3ff12dbc34b3c1d99e89f4383fc98c3.zip FreeBSD-src-10b87d8ba3ff12dbc34b3c1d99e89f4383fc98c3.tar.gz | |
MFC r313439,r314450:
r313439:
Merge content from ^/projects/netbsd-tests-upstream-01-2017 into ^/head
The primary end-goal of this drop is ease future merges with NetBSD and
collaborate further with the NetBSD project.
The goal was (largely, not completely as some items are still oustanding
in the NetBSD GNATS system) achieved by doing the following:
- Pushing as many changes required to port contrib/netbsd-tests
back to NetBSD as possible, then pull the upstream applied changes
back in to FreeBSD.
- Diff reduce with upstream where possible by:
-- Improving libnetbsd header, etc compat glue.
-- Using _SED variables to modify test scripts on the fly for items
that could not be upstreamed to NetBSD.
As a bonus for this work, this change also introduces testcases for
uniq(1).
Many thanks to Christos for working with me to get many of the changes
back into the NetBSD project.
In collaboration with: Christos Zoulas <christos@netbsd.org>
r314450:
Add additional __FreeBSD_version guards around the hsearch_r testcases
The reasoning for this is the same as r276046: to ease MFCing the tests
to ^/stable/10 .
This was accidentally missed in r313439
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/tests/hash/Makefile | 3 | ||||
| -rw-r--r-- | lib/libc/tests/regex/Makefile | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile index 1e2cd29..7811d45 100644 --- a/lib/libc/tests/hash/Makefile +++ b/lib/libc/tests/hash/Makefile @@ -32,8 +32,7 @@ ${PACKAGE}DATA_FILES+= data/sha1test2-out LIBADD+= md LIBADD.sha2_test+= crypto -CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh/openbsd-compat -CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh +CFLAGS.h_hash+= -I${SRCTOP}/lib/libnetbsd .include "../Makefile.netbsd-tests" diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile index c4f4351..b16f503 100644 --- a/lib/libc/tests/regex/Makefile +++ b/lib/libc/tests/regex/Makefile @@ -6,7 +6,8 @@ PACKAGE= tests BINDIR= ${TESTSDIR} -IMPLEMENTATION?= -DREGEX_SPENCER +# SKIP_LEFTASSOC -> these testcases fail on FreeBSD. +IMPLEMENTATION?= -DREGEX_SPENCER -DSKIP_LEFTASSOC CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex PROGS+= h_regex |
