Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Nov 2015 20:08:34 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r290875 - in stable/10: lib/libc/tests/string tools/regression/lib/libc/string
Message-ID:  <201511152008.tAFK8Ykm080746@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Sun Nov 15 20:08:34 2015
New Revision: 290875
URL: https://svnweb.freebsd.org/changeset/base/290875

Log:
  MFC r290539:
  
  Integrate tools/regression/lib/libc/string into the FreeBSD test suite
  as lib/libc/tests/string
  
  Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/lib/libc/tests/string/stpncpy_test.c
     - copied unchanged from r290539, head/lib/libc/tests/string/stpncpy_test.c
  stable/10/lib/libc/tests/string/strerror_test.c
     - copied unchanged from r290539, head/lib/libc/tests/string/strerror_test.c
  stable/10/lib/libc/tests/string/wcscasecmp_test.c
     - copied unchanged from r290539, head/lib/libc/tests/string/wcscasecmp_test.c
  stable/10/lib/libc/tests/string/wcsnlen_test.c
     - copied unchanged from r290539, head/lib/libc/tests/string/wcsnlen_test.c
Deleted:
  stable/10/tools/regression/lib/libc/string/
Modified:
  stable/10/lib/libc/tests/string/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/tests/string/Makefile
==============================================================================
--- stable/10/lib/libc/tests/string/Makefile	Sun Nov 15 20:00:00 2015	(r290874)
+++ stable/10/lib/libc/tests/string/Makefile	Sun Nov 15 20:08:34 2015	(r290875)
@@ -1,6 +1,9 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+ATF_TESTS_C+=		stpncpy_test
+ATF_TESTS_C+=		strerror2_test
+ATF_TESTS_C+=		wcscasecmp_test
+ATF_TESTS_C+=		wcsnlen_test
 
 TESTSDIR=	${TESTSBASE}/lib/libc/string
 
@@ -22,6 +25,8 @@ NETBSD_ATF_TESTS_C+=	strrchr
 NETBSD_ATF_TESTS_C+=	strspn
 NETBSD_ATF_TESTS_C+=	swab
 
+SRCS.strerror2_test=	strerror_test.c
+
 .include "../Makefile.netbsd-tests"
 
 LDADD.memchr+=	-lmd

Copied: stable/10/lib/libc/tests/string/stpncpy_test.c (from r290539, head/lib/libc/tests/string/stpncpy_test.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/libc/tests/string/stpncpy_test.c	Sun Nov 15 20:08:34 2015	(r290875, copy of r290539, head/lib/libc/tests/string/stpncpy_test.c)
@@ -0,0 +1,110 @@
+/*-
+ * Copyright (c) 2009 David Schultz <das@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 <sys/param.h>
+#include <sys/mman.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+static char *
+makebuf(size_t len, int guard_at_end)
+{
+	char *buf;
+	size_t alloc_size = roundup2(len, PAGE_SIZE) + PAGE_SIZE;
+
+	buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+	assert(buf);
+	if (guard_at_end) {
+		assert(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0);
+		return (buf + alloc_size - PAGE_SIZE - len);
+	} else {
+		assert(munmap(buf, PAGE_SIZE) == 0);
+		return (buf + PAGE_SIZE);
+	}
+}
+
+static void
+test_stpncpy(const char *s)
+{
+	char *src, *dst;
+	size_t size, len, bufsize, x;
+	int i, j;
+
+	size = strlen(s) + 1;
+	for (i = 0; i <= 1; i++) {
+		for (j = 0; j <= 1; j++) {
+			for (bufsize = 0; bufsize <= size + 10; bufsize++) {
+				src = makebuf(size, i);
+				memcpy(src, s, size);
+				dst = makebuf(bufsize, j);
+				memset(dst, 'X', bufsize);
+				len = (bufsize < size) ? bufsize : size - 1;
+				assert(stpncpy(dst, src, bufsize) == dst+len);
+				assert(memcmp(src, dst, len) == 0);
+				for (x = len; x < bufsize; x++)
+					assert(dst[x] == '\0');
+			}
+		}
+	}
+}
+
+ATF_TC_WITHOUT_HEAD(nul);
+ATF_TC_BODY(nul, tc)
+{
+
+	test_stpncpy("");
+}
+
+ATF_TC_WITHOUT_HEAD(foo);
+ATF_TC_BODY(foo, tc)
+{
+
+	test_stpncpy("foo");
+}
+
+ATF_TC_WITHOUT_HEAD(glorp);
+ATF_TC_BODY(glorp, tc)
+{
+
+	test_stpncpy("glorp");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nul);
+	ATF_TP_ADD_TC(tp, foo);
+	ATF_TP_ADD_TC(tp, glorp);
+
+	return (atf_no_error());
+}

Copied: stable/10/lib/libc/tests/string/strerror_test.c (from r290539, head/lib/libc/tests/string/strerror_test.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/libc/tests/string/strerror_test.c	Sun Nov 15 20:08:34 2015	(r290875, copy of r290539, head/lib/libc/tests/string/strerror_test.c)
@@ -0,0 +1,206 @@
+/*-
+ * Copyright (c) 2001 Wes Peters <wes@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.
+ *
+ * $FreeBSD$
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atf-c.h>
+
+static char buf[64];
+static char *sret;
+static int iret;
+
+ATF_TC_WITHOUT_HEAD(strerror_unknown_error);
+ATF_TC_BODY(strerror_unknown_error, tc)
+{
+
+	errno = 0;
+	sret = strerror(INT_MAX);
+	snprintf(buf, sizeof(buf), "Unknown error: %d", INT_MAX);
+	ATF_CHECK(strcmp(sret, buf) == 0);
+	ATF_CHECK(errno == EINVAL);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_no_error);
+ATF_TC_BODY(strerror_no_error, tc)
+{
+
+	errno = 0;
+	sret = strerror(0);
+	ATF_CHECK(strcmp(sret, "No error: 0") == 0);
+	ATF_CHECK(errno == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_EPERM_test);
+ATF_TC_BODY(strerror_EPERM_test, tc)
+{
+
+	errno = 0;
+	sret = strerror(EPERM);
+	ATF_CHECK(strcmp(sret, "Operation not permitted") == 0);
+	ATF_CHECK(errno == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_EPFNOSUPPORT_test);
+ATF_TC_BODY(strerror_EPFNOSUPPORT_test, tc)
+{
+
+	errno = 0;
+	sret = strerror(EPFNOSUPPORT);
+	ATF_CHECK(strcmp(sret, "Protocol family not supported") == 0);
+	ATF_CHECK(errno == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_ELAST_test);
+ATF_TC_BODY(strerror_ELAST_test, tc)
+{
+
+	errno = 0;
+	sret = strerror(ELAST);
+	ATF_CHECK(errno == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__unknown_error);
+ATF_TC_BODY(strerror_r__unknown_error, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	iret = strerror_r(-1, buf, sizeof(buf));
+	ATF_CHECK(strcmp(buf, "Unknown error: -1") == 0);
+	ATF_CHECK(iret == EINVAL);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EPERM_one_byte_short);
+ATF_TC_BODY(strerror_r__EPERM_one_byte_short, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	/* One byte too short. */
+	iret = strerror_r(EPERM, buf, strlen("Operation not permitted"));
+	ATF_CHECK(strcmp(buf, "Operation not permitte") == 0);
+	ATF_CHECK(iret == ERANGE);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EPERM_unknown_error_one_byte_short);
+ATF_TC_BODY(strerror_r__EPERM_unknown_error_one_byte_short, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	/* One byte too short. */
+	iret = strerror_r(-1, buf, strlen("Unknown error: -1"));
+	ATF_CHECK(strcmp(buf, "Unknown error: -") == 0);
+	ATF_CHECK(iret == EINVAL);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EPERM_unknown_error_two_bytes_short);
+ATF_TC_BODY(strerror_r__EPERM_unknown_error_two_bytes_short, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	/* Two bytes too short. */
+	iret = strerror_r(-2, buf, strlen("Unknown error: -2") - 1);
+	ATF_CHECK(strcmp(buf, "Unknown error: ") == 0);
+	ATF_CHECK(iret == EINVAL);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EPERM_unknown_error_three_bytes_short);
+ATF_TC_BODY(strerror_r__EPERM_unknown_error_three_bytes_short, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	/* Three bytes too short. */
+	iret = strerror_r(-2, buf, strlen("Unknown error: -2") - 2);
+	ATF_CHECK(strcmp(buf, "Unknown error:") == 0);
+	ATF_CHECK(iret == EINVAL);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EPERM_unknown_error_12345_one_byte_short);
+ATF_TC_BODY(strerror_r__EPERM_unknown_error_12345_one_byte_short, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	/* One byte too short. */
+	iret = strerror_r(12345, buf, strlen("Unknown error: 12345"));
+	ATF_CHECK(strcmp(buf, "Unknown error: 1234") == 0);
+	ATF_CHECK(iret == EINVAL);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__no_error);
+ATF_TC_BODY(strerror_r__no_error, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	iret = strerror_r(0, buf, sizeof(buf));
+	ATF_CHECK(strcmp(buf, "No error: 0") == 0);
+	ATF_CHECK(iret == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EDEADLK);
+ATF_TC_BODY(strerror_r__EDEADLK, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	iret = strerror_r(EDEADLK, buf, sizeof(buf));
+	ATF_CHECK(strcmp(buf, "Resource deadlock avoided") == 0);
+	ATF_CHECK(iret == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(strerror_r__EPROCLIM);
+ATF_TC_BODY(strerror_r__EPROCLIM, tc)
+{
+
+	memset(buf, '*', sizeof(buf));
+	iret = strerror_r(EPROCLIM, buf, sizeof(buf));
+	ATF_CHECK(strcmp(buf, "Too many processes") == 0);
+	ATF_CHECK(iret == 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, strerror_unknown_error);
+	ATF_TP_ADD_TC(tp, strerror_no_error);
+	ATF_TP_ADD_TC(tp, strerror_EPERM_test);
+	ATF_TP_ADD_TC(tp, strerror_EPFNOSUPPORT_test);
+	ATF_TP_ADD_TC(tp, strerror_ELAST_test);
+	ATF_TP_ADD_TC(tp, strerror_r__unknown_error);
+	ATF_TP_ADD_TC(tp, strerror_r__EPERM_one_byte_short);
+	ATF_TP_ADD_TC(tp, strerror_r__EPERM_unknown_error_one_byte_short);
+	ATF_TP_ADD_TC(tp, strerror_r__EPERM_unknown_error_two_bytes_short);
+	ATF_TP_ADD_TC(tp, strerror_r__EPERM_unknown_error_three_bytes_short);
+	ATF_TP_ADD_TC(tp, strerror_r__EPERM_unknown_error_12345_one_byte_short);
+	ATF_TP_ADD_TC(tp, strerror_r__no_error);
+	ATF_TP_ADD_TC(tp, strerror_r__EDEADLK);
+	ATF_TP_ADD_TC(tp, strerror_r__EPROCLIM);
+
+	return (atf_no_error());
+}

Copied: stable/10/lib/libc/tests/string/wcscasecmp_test.c (from r290539, head/lib/libc/tests/string/wcscasecmp_test.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/libc/tests/string/wcscasecmp_test.c	Sun Nov 15 20:08:34 2015	(r290875, copy of r290539, head/lib/libc/tests/string/wcscasecmp_test.c)
@@ -0,0 +1,128 @@
+/*-
+ * Copyright (c) 2009 David Schultz <das@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 <assert.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#include <atf-c.h>
+
+ATF_TC_WITHOUT_HEAD(nul);
+ATF_TC_BODY(nul, tc)
+{
+
+	ATF_REQUIRE(setlocale(LC_CTYPE, "C") != NULL);
+
+	ATF_CHECK(wcscasecmp(L"", L"") == 0);
+	ATF_CHECK(wcsncasecmp(L"", L"", 50) == 0);
+	ATF_CHECK(wcsncasecmp(L"", L"", 0) == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(wcscasecmp_equal);
+ATF_TC_BODY(wcscasecmp_equal, tc)
+{
+
+	ATF_REQUIRE(setlocale(LC_CTYPE, "C") != NULL);
+
+	ATF_CHECK(wcscasecmp(L"abc", L"abc") == 0);
+	ATF_CHECK(wcscasecmp(L"ABC", L"ABC") == 0);
+	ATF_CHECK(wcscasecmp(L"abc", L"ABC") == 0);
+	ATF_CHECK(wcscasecmp(L"ABC", L"abc") == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(wcscasecmp_same_len_buffers);
+ATF_TC_BODY(wcscasecmp_same_len_buffers, tc)
+{
+
+	ATF_REQUIRE(setlocale(LC_CTYPE, "C") != NULL);
+
+	ATF_CHECK(wcscasecmp(L"abc", L"xyz") < 0);
+	ATF_CHECK(wcscasecmp(L"ABC", L"xyz") < 0);
+	ATF_CHECK(wcscasecmp(L"abc", L"XYZ") < 0);
+	ATF_CHECK(wcscasecmp(L"ABC", L"XYZ") < 0);
+	ATF_CHECK(wcscasecmp(L"xyz", L"abc") > 0);
+	ATF_CHECK(wcscasecmp(L"XYZ", L"abc") > 0);
+	ATF_CHECK(wcscasecmp(L"xyz", L"ABC") > 0);
+	ATF_CHECK(wcscasecmp(L"XYZ", L"ABC") > 0);
+}
+
+ATF_TC_WITHOUT_HEAD(wcscasecmp_mismatched_len_buffers);
+ATF_TC_BODY(wcscasecmp_mismatched_len_buffers, tc)
+{
+
+	ATF_REQUIRE(setlocale(LC_CTYPE, "C") != NULL);
+
+	ATF_CHECK(wcscasecmp(L"abc", L"ABCD") < 0);
+	ATF_CHECK(wcscasecmp(L"ABC", L"abcd") < 0);
+	ATF_CHECK(wcscasecmp(L"abcd", L"ABC") > 0);
+	ATF_CHECK(wcscasecmp(L"ABCD", L"abc") > 0);
+}
+
+ATF_TC_WITHOUT_HEAD(wcsncasecmp);
+ATF_TC_BODY(wcsncasecmp, tc)
+{
+
+	ATF_REQUIRE(setlocale(LC_CTYPE, "C") != NULL);
+
+	ATF_CHECK(wcsncasecmp(L"abc", L"ABCD", 4) < 0);
+	ATF_CHECK(wcsncasecmp(L"ABC", L"abcd", 4) < 0);
+	ATF_CHECK(wcsncasecmp(L"abcd", L"ABC", 4) > 0);
+	ATF_CHECK(wcsncasecmp(L"ABCD", L"abc", 4) > 0);
+	ATF_CHECK(wcsncasecmp(L"abc", L"ABCD", 3) == 0);
+	ATF_CHECK(wcsncasecmp(L"ABC", L"abcd", 3) == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(wcscasecmp_greek);
+ATF_TC_BODY(wcscasecmp_greek, tc)
+{
+
+	ATF_REQUIRE(setlocale(LC_CTYPE, "C") != NULL);
+
+	ATF_CHECK(wcscasecmp(L"λ", L"Λ") != 0);
+	ATF_REQUIRE(setlocale(LC_CTYPE, "el_GR.UTF-8") != NULL);
+	ATF_CHECK(wcscasecmp(L"λ", L"Λ") == 0);
+	ATF_CHECK(wcscasecmp(L"λ", L"Ω") < 0);
+	ATF_CHECK(wcscasecmp(L"Ω", L"λ") > 0);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nul);
+	ATF_TP_ADD_TC(tp, wcscasecmp_equal);
+	ATF_TP_ADD_TC(tp, wcscasecmp_same_len_buffers);
+	ATF_TP_ADD_TC(tp, wcscasecmp_mismatched_len_buffers);
+	ATF_TP_ADD_TC(tp, wcsncasecmp);
+	ATF_TP_ADD_TC(tp, wcscasecmp_greek);
+
+	return (atf_no_error());
+}

Copied: stable/10/lib/libc/tests/string/wcsnlen_test.c (from r290539, head/lib/libc/tests/string/wcsnlen_test.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/libc/tests/string/wcsnlen_test.c	Sun Nov 15 20:08:34 2015	(r290875, copy of r290539, head/lib/libc/tests/string/wcsnlen_test.c)
@@ -0,0 +1,104 @@
+/*-
+ * Copyright (c) 2009 David Schultz <das@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 <sys/param.h>
+#include <sys/mman.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+static void *
+makebuf(size_t len, int guard_at_end)
+{
+	char *buf;
+	size_t alloc_size = roundup2(len, PAGE_SIZE) + PAGE_SIZE;
+
+	buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+	ATF_CHECK(buf);
+	if (guard_at_end) {
+		ATF_CHECK(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0);
+		return (buf + alloc_size - PAGE_SIZE - len);
+	} else {
+		ATF_CHECK(munmap(buf, PAGE_SIZE) == 0);
+		return (buf + PAGE_SIZE);
+	}
+}
+
+static void
+test_wcsnlen(const wchar_t *s)
+{
+	wchar_t *s1;
+	size_t size, len, bufsize;
+	int i;
+
+	size = wcslen(s) + 1;
+	for (i = 0; i <= 1; i++) {
+		for (bufsize = 0; bufsize <= size + 10; bufsize++) {
+			s1 = makebuf(bufsize * sizeof(wchar_t), i);
+			wmemcpy(s1, s, bufsize);
+			len = (size > bufsize) ? bufsize : size - 1;
+			ATF_CHECK(wcsnlen(s1, bufsize) == len);
+		}
+	}
+}
+
+ATF_TC_WITHOUT_HEAD(nul);
+ATF_TC_BODY(nul, tc)
+{
+
+	test_wcsnlen(L"");
+}
+
+ATF_TC_WITHOUT_HEAD(foo);
+ATF_TC_BODY(foo, tc)
+{
+
+	test_wcsnlen(L"foo");
+}
+
+ATF_TC_WITHOUT_HEAD(glorp);
+ATF_TC_BODY(glorp, tc)
+{
+
+	test_wcsnlen(L"glorp");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, nul);
+	ATF_TP_ADD_TC(tp, foo);
+	ATF_TP_ADD_TC(tp, glorp);
+
+	return (atf_no_error());
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511152008.tAFK8Ykm080746>