d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build :strvis_locale if VIS_NOLOCALE is undefined

Browse Source 
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
This commit is contained in:
ngie 2016-12-03 03:56:20 +00:00
parent 1496a43460
commit 1a9b2d76d8
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/netbsd-tests/lib/libc/gen/t_vis.c
View File

@ -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(strvis_locale);
ATF_TC_HEAD(strvis_locale, tc) ATF_TC_HEAD(strvis_locale, tc)
{ {
@ -172,6 +175,9 @@ ATF_TC_BODY(strvis_locale, tc)
setlocale(LC_CTYPE, ol); setlocale(LC_CTYPE, ol);
free(ol); free(ol);
} }
/* Begin FreeBSD: ^/stable/10 doesn't have VIS_NOLOCALE */
#endif /* VIS_NOLOCALE */
/* End FreeBSD */
ATF_TP_ADD_TCS(tp) 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_null);
ATF_TP_ADD_TC(tp, strvis_empty); ATF_TP_ADD_TC(tp, strvis_empty);
ATF_TP_ADD_TC(tp, strunvis_hex); 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); 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(); return atf_no_error();
} }