diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-12-03 03:56:20 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-12-03 03:56:20 +0000 |
| commit | 72a02000d9c0bc1864ec1aa842ccfe364d8ef82a (patch) | |
| tree | cf8aa96110029b6880e56c7eb332c037a923227e /contrib | |
| parent | 612a96b4a84c9c05e31c6aa399976d473fe1cb68 (diff) | |
| download | src-72a02000d9c0bc1864ec1aa842ccfe364d8ef82a.tar.gz src-72a02000d9c0bc1864ec1aa842ccfe364d8ef82a.zip | |
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
MFC after: now
Notes
Notes:
svn path=/head/; revision=309474
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/netbsd-tests/lib/libc/gen/t_vis.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_vis.c b/contrib/netbsd-tests/lib/libc/gen/t_vis.c index 38decb3069c9..76f85f495b3f 100644 --- a/contrib/netbsd-tests/lib/libc/gen/t_vis.c +++ b/contrib/netbsd-tests/lib/libc/gen/t_vis.c @@ -144,6 +144,9 @@ ATF_TC_BODY(strunvis_hex, tc) } } +/* Begin FreeBSD: ^/stable/10 doesn't have VIS_NOLOCALE */ +#ifdef VIS_NOLOCALE +/* End FreeBSD */ ATF_TC(strvis_locale); ATF_TC_HEAD(strvis_locale, tc) { @@ -172,6 +175,9 @@ ATF_TC_BODY(strvis_locale, tc) setlocale(LC_CTYPE, ol); free(ol); } +/* Begin FreeBSD: ^/stable/10 doesn't have VIS_NOLOCALE */ +#endif /* VIS_NOLOCALE */ +/* End FreeBSD */ ATF_TP_ADD_TCS(tp) { @@ -180,7 +186,13 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, strvis_null); ATF_TP_ADD_TC(tp, strvis_empty); ATF_TP_ADD_TC(tp, strunvis_hex); +/* Begin FreeBSD: ^/stable/10 doesn't have VIS_NOLOCALE */ +#ifdef VIS_NOLOCALE +/* End FreeBSD */ ATF_TP_ADD_TC(tp, strvis_locale); +/* Begin FreeBSD: ^/stable/10 doesn't have VIS_NOLOCALE */ +#endif /* VIS_NOLOCALE */ +/* End FreeBSD */ return atf_no_error(); } |