Index: stable/11/lib/libc/tests/string/Makefile
===================================================================
--- stable/11/lib/libc/tests/string/Makefile	(revision 317645)
+++ stable/11/lib/libc/tests/string/Makefile	(revision 317646)
@@ -1,35 +1,36 @@
 # $FreeBSD$
 
 ATF_TESTS_C+=		memcmp_test
 ATF_TESTS_C+=		memset_s_test
 ATF_TESTS_C+=		stpncpy_test
 ATF_TESTS_C+=		strerror2_test
 ATF_TESTS_C+=		wcscasecmp_test
 ATF_TESTS_C+=		wcsnlen_test
+ATF_TESTS_C+=		wcscoll_test
 
 # TODO: popcount, stresep
 
 NETBSD_ATF_TESTS_C+=	memchr_test
 NETBSD_ATF_TESTS_C+=	memcpy_test
 NETBSD_ATF_TESTS_C+=	memmem_test
 NETBSD_ATF_TESTS_C+=	memset_test
 NETBSD_ATF_TESTS_C+=	strcat_test
 NETBSD_ATF_TESTS_C+=	strchr_test
 NETBSD_ATF_TESTS_C+=	strcmp_test
 NETBSD_ATF_TESTS_C+=	strcpy_test
 NETBSD_ATF_TESTS_C+=	strcspn_test
 NETBSD_ATF_TESTS_C+=	strerror_test
 NETBSD_ATF_TESTS_C+=	strlen_test
 NETBSD_ATF_TESTS_C+=	strpbrk_test
 NETBSD_ATF_TESTS_C+=	strrchr_test
 NETBSD_ATF_TESTS_C+=	strspn_test
 NETBSD_ATF_TESTS_C+=	swab_test
 
 SRCS.strerror2_test=	strerror_test.c
 
 .include "../Makefile.netbsd-tests"
 
 LIBADD.memchr_test+=	md
 LIBADD.memcpy_test+=	md
 
 .include <bsd.test.mk>
Index: stable/11/lib/libc/tests/string/wcscoll_test.c
===================================================================
--- stable/11/lib/libc/tests/string/wcscoll_test.c	(nonexistent)
+++ stable/11/lib/libc/tests/string/wcscoll_test.c	(revision 317646)
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2016 Baptiste Daroussin <bapt@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <wchar.h>
+#include <locale.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+static int
+cmp(const void *a, const void *b)
+{
+	const wchar_t wa[2] = { *(const wchar_t *)a, 0 };
+	const wchar_t wb[2] = { *(const wchar_t *)b, 0 };
+
+	return (wcscoll(wa, wb));
+}
+
+ATF_TC_WITHOUT_HEAD(russian_collation);
+ATF_TC_BODY(russian_collation, tc)
+{
+	wchar_t c[] = L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzЁАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяё";
+	wchar_t res[] = L"aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZаАбБвВгГдДеЕёЁжЖзЗиИйЙкКлЛмМнНоОпПрРсСтТуУфФхХцЦчЧшШщЩъЪыЫьЬэЭюЮяЯ";
+
+	ATF_CHECK_MSG(setlocale(LC_ALL, "ru_RU.UTF-8") != NULL,
+	    "Fail to set locale to \"ru_RU.UTF-8\"");
+	qsort(c, wcslen(c), sizeof(wchar_t), cmp);
+	ATF_CHECK_MSG(wcscmp(c, res) == 0,
+	    "Bad collation, expected: '%ls' got '%ls'", res, c);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, russian_collation);
+
+	return (atf_no_error());
+}

Property changes on: stable/11/lib/libc/tests/string/wcscoll_test.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/11
===================================================================
--- stable/11	(revision 317645)
+++ stable/11	(revision 317646)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r302920