Index: stable/10/lib/libc/tests/Makefile
===================================================================
--- stable/10/lib/libc/tests/Makefile	(revision 309453)
+++ stable/10/lib/libc/tests/Makefile	(revision 309454)
@@ -1,35 +1,39 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/lib/libc
 
 SUBDIR=		tls_dso
 
 TESTS_SUBDIRS=	c063
 TESTS_SUBDIRS+=	db
 TESTS_SUBDIRS+=	gen
 TESTS_SUBDIRS+=	hash
 TESTS_SUBDIRS+=	inet
 TESTS_SUBDIRS+=	net
 TESTS_SUBDIRS+=	nss
 TESTS_SUBDIRS+=	regex
 TESTS_SUBDIRS+=	resolv
 TESTS_SUBDIRS+=	rpc
 TESTS_SUBDIRS+=	stdio
 TESTS_SUBDIRS+=	stdlib
 TESTS_SUBDIRS+=	string
 TESTS_SUBDIRS+=	sys
 TESTS_SUBDIRS+=	termios
 TESTS_SUBDIRS+=	tls
 TESTS_SUBDIRS+=	ttyio
 
+.if ${MK_ICONV} != "no"
+TESTS_SUBDIRS+=	iconv
+.endif
+
 .if ${MK_LOCALES} != "no"
 TESTS_SUBDIRS+=	locale
 .endif
 
 .if ${MK_SSP} != "no"
 TESTS_SUBDIRS+=	ssp
 .endif
 
 .include <bsd.test.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 309453)
+++ stable/10	(revision 309454)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r307700
   Merged /stable/11:r309453