svn commit: r309475 - stable/11/contrib/netbsd-tests/lib/libc/gen

[Ngie Cooper]

Author: ngie
Date: Sat Dec  3 03:59:24 2016
New Revision: 309475
URL: https://svnweb.freebsd.org/changeset/base/309475

Log:
  MFC 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

Modified:
  stable/11/contrib/netbsd-tests/lib/libc/gen/t_vis.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/netbsd-tests/lib/libc/gen/t_vis.c
==============================================================================
--- stable/11/contrib/netbsd-tests/lib/libc/gen/t_vis.c	Sat Dec  3 03:56:20 2016	(r309474)
+++ stable/11/contrib/netbsd-tests/lib/libc/gen/t_vis.c	Sat Dec  3 03:59:24 2016	(r309475)
@@ -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();
 }