svn commit: r317646 - stable/11/lib/libc/tests/string

[Baptiste Daroussin]

Author: bapt
Date: Mon May  1 12:41:10 2017
New Revision: 317646
URL: https://svnweb.freebsd.org/changeset/base/317646

Log:
  MFC r302920
  
  Add a regression test to make sure the Russian collation is actually working
  
  when importing collation support from Dragonfly/Illumos amdmi3@ tested the
  collation branch and reported an issue with Russian collation. John Marino fixed
  the issue in Dragonfly and I merged it back to FreeBSD.
  
  Now that Illumos is working on merging our fixes they (Lauri Tirkkonen) found
  issues with the commit that fixes the russian collation in UTF-8 that resulted
  in a crash with strxfrm(3) and the ISO-8859-5 locale (fixed in FreeBSD r302916).
  This small test was written to ensure we do not bring back the old issue with
  russian collation while fixing the other issue.

Added:
  stable/11/lib/libc/tests/string/wcscoll_test.c
     - copied unchanged from r302920, head/lib/libc/tests/string/wcscoll_test.c
Modified:
  stable/11/lib/libc/tests/string/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libc/tests/string/Makefile
==============================================================================
--- stable/11/lib/libc/tests/string/Makefile	Mon May  1 12:25:37 2017	(r317645)
+++ stable/11/lib/libc/tests/string/Makefile	Mon May  1 12:41:10 2017	(r317646)
@@ -6,6 +6,7 @@ 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
 

Copied: stable/11/lib/libc/tests/string/wcscoll_test.c (from r302920, head/lib/libc/tests/string/wcscoll_test.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/lib/libc/tests/string/wcscoll_test.c	Mon May  1 12:41:10 2017	(r317646, copy of r302920, head/lib/libc/tests/string/wcscoll_test.c)
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2016 Baptiste Daroussin <bapt at 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());
+}