summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-11-15 20:08:34 +0000
committerngie <ngie@FreeBSD.org>2015-11-15 20:08:34 +0000
commitcb105a7b494ec278ae2e334c003eabb4348d724f (patch)
tree007a426fe727fd2193dc668a3b0c16cc5373ce47
parent2222968ca1ef3755448527615b71a84651b030c6 (diff)
downloadFreeBSD-src-cb105a7b494ec278ae2e334c003eabb4348d724f.zip
FreeBSD-src-cb105a7b494ec278ae2e334c003eabb4348d724f.tar.gz
MFC r290539:
Integrate tools/regression/lib/libc/string into the FreeBSD test suite as lib/libc/tests/string Sponsored by: EMC / Isilon Storage Division
-rw-r--r--lib/libc/tests/string/Makefile7
-rw-r--r--lib/libc/tests/string/stpncpy_test.c (renamed from tools/regression/lib/libc/string/test-stpncpy.c)35
-rw-r--r--lib/libc/tests/string/strerror_test.c206
-rw-r--r--lib/libc/tests/string/wcscasecmp_test.c128
-rw-r--r--lib/libc/tests/string/wcsnlen_test.c (renamed from tools/regression/lib/libc/string/test-wcsnlen.c)53
-rw-r--r--tools/regression/lib/libc/string/Makefile11
-rw-r--r--tools/regression/lib/libc/string/test-strerror.c147
-rw-r--r--tools/regression/lib/libc/string/test-strerror.t10
-rw-r--r--tools/regression/lib/libc/string/test-wcscasecmp.c88
9 files changed, 401 insertions, 284 deletions
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 3c30ab6..0b7f58a 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -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
diff --git a/tools/regression/lib/libc/string/test-stpncpy.c b/lib/libc/tests/string/stpncpy_test.c
index 91120cb..0a7b1d2 100644
--- a/tools/regression/lib/libc/string/test-stpncpy.c
+++ b/lib/libc/tests/string/stpncpy_test.c
@@ -27,13 +27,15 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/mman.h>
#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)
{
@@ -76,18 +78,33 @@ test_stpncpy(const char *s)
}
}
-int
-main(int argc, char *argv[])
+ATF_TC_WITHOUT_HEAD(nul);
+ATF_TC_BODY(nul, tc)
{
- printf("1..3\n");
-
test_stpncpy("");
- printf("ok 1 - stpncpy\n");
+}
+
+ATF_TC_WITHOUT_HEAD(foo);
+ATF_TC_BODY(foo, tc)
+{
+
test_stpncpy("foo");
- printf("ok 2 - stpncpy\n");
+}
+
+ATF_TC_WITHOUT_HEAD(glorp);
+ATF_TC_BODY(glorp, tc)
+{
+
test_stpncpy("glorp");
- printf("ok 3 - stpncpy\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, nul);
+ ATF_TP_ADD_TC(tp, foo);
+ ATF_TP_ADD_TC(tp, glorp);
- exit(0);
+ return (atf_no_error());
}
diff --git a/lib/libc/tests/string/strerror_test.c b/lib/libc/tests/string/strerror_test.c
new file mode 100644
index 0000000..51bbf17
--- /dev/null
+++ b/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());
+}
diff --git a/lib/libc/tests/string/wcscasecmp_test.c b/lib/libc/tests/string/wcscasecmp_test.c
new file mode 100644
index 0000000..4385f3a
--- /dev/null
+++ b/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());
+}
diff --git a/tools/regression/lib/libc/string/test-wcsnlen.c b/lib/libc/tests/string/wcsnlen_test.c
index fda8a40..ec11938 100644
--- a/tools/regression/lib/libc/string/test-wcsnlen.c
+++ b/lib/libc/tests/string/wcsnlen_test.c
@@ -27,14 +27,16 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/mman.h>
#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)
{
@@ -42,12 +44,12 @@ makebuf(size_t len, int guard_at_end)
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);
+ ATF_CHECK(buf);
if (guard_at_end) {
- assert(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0);
+ ATF_CHECK(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0);
return (buf + alloc_size - PAGE_SIZE - len);
} else {
- assert(munmap(buf, PAGE_SIZE) == 0);
+ ATF_CHECK(munmap(buf, PAGE_SIZE) == 0);
return (buf + PAGE_SIZE);
}
}
@@ -61,27 +63,42 @@ test_wcsnlen(const wchar_t *s)
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;
- assert(wcsnlen(s1, bufsize) == len);
- }
+ 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);
+ }
}
}
-int
-main(int argc, char *argv[])
+ATF_TC_WITHOUT_HEAD(nul);
+ATF_TC_BODY(nul, tc)
{
- printf("1..3\n");
-
test_wcsnlen(L"");
- printf("ok 1 - wcsnlen\n");
+}
+
+ATF_TC_WITHOUT_HEAD(foo);
+ATF_TC_BODY(foo, tc)
+{
+
test_wcsnlen(L"foo");
- printf("ok 2 - wcsnlen\n");
+}
+
+ATF_TC_WITHOUT_HEAD(glorp);
+ATF_TC_BODY(glorp, tc)
+{
+
test_wcsnlen(L"glorp");
- printf("ok 3 - wcsnlen\n");
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, nul);
+ ATF_TP_ADD_TC(tp, foo);
+ ATF_TP_ADD_TC(tp, glorp);
- exit(0);
+ return (atf_no_error());
}
diff --git a/tools/regression/lib/libc/string/Makefile b/tools/regression/lib/libc/string/Makefile
deleted file mode 100644
index 2c34ca3..0000000
--- a/tools/regression/lib/libc/string/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-TESTS= test-stpncpy test-strerror test-wcscasecmp test-wcsnlen
-
-.PHONY: tests
-tests: ${TESTS}
- for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
- -rm -f ${TESTS}
diff --git a/tools/regression/lib/libc/string/test-strerror.c b/tools/regression/lib/libc/string/test-strerror.c
deleted file mode 100644
index 84e1b45..0000000
--- a/tools/regression/lib/libc/string/test-strerror.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * 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>
-
-static int test_count = 1;
-static int exit_status = EXIT_SUCCESS;
-
-#define CHECK(x) \
- do { \
- if (x) { \
- printf("ok %d\n", test_count); \
- } else { \
- printf("not ok %d # %s\n", test_count, #x); \
- exit_status = EXIT_FAILURE; \
- } \
- ++test_count; \
- } while (0)
-
-int
-main(void)
-{
- char buf[64];
- char *sret;
- int iret;
-
- printf("1..27\n");
-
- /*
- * strerror() failure tests.
- */
- errno = 0;
- sret = strerror(INT_MAX);
- snprintf(buf, sizeof(buf), "Unknown error: %d", INT_MAX);
- CHECK(strcmp(sret, buf) == 0);
- CHECK(errno == EINVAL);
-
- /*
- * strerror() success tests.
- */
- errno = 0;
- sret = strerror(0);
- CHECK(strcmp(sret, "No error: 0") == 0);
- CHECK(errno == 0);
-
- errno = 0;
- sret = strerror(EPERM);
- CHECK(strcmp(sret, "Operation not permitted") == 0);
- CHECK(errno == 0);
-
- errno = 0;
- sret = strerror(EPFNOSUPPORT);
- CHECK(strcmp(sret, "Protocol family not supported") == 0);
- CHECK(errno == 0);
-
- errno = 0;
- sret = strerror(ELAST);
- CHECK(errno == 0);
-
- /*
- * strerror_r() failure tests.
- */
- memset(buf, '*', sizeof(buf));
- iret = strerror_r(-1, buf, sizeof(buf));
- CHECK(strcmp(buf, "Unknown error: -1") == 0);
- CHECK(iret == EINVAL);
-
- memset(buf, '*', sizeof(buf));
- /* One byte too short. */
- iret = strerror_r(EPERM, buf, strlen("Operation not permitted"));
- CHECK(strcmp(buf, "Operation not permitte") == 0);
- CHECK(iret == ERANGE);
-
- memset(buf, '*', sizeof(buf));
- /* One byte too short. */
- iret = strerror_r(-1, buf, strlen("Unknown error: -1"));
- CHECK(strcmp(buf, "Unknown error: -") == 0);
- CHECK(iret == EINVAL);
-
- memset(buf, '*', sizeof(buf));
- /* Two bytes too short. */
- iret = strerror_r(-2, buf, strlen("Unknown error: -2") - 1);
- CHECK(strcmp(buf, "Unknown error: ") == 0);
- CHECK(iret == EINVAL);
-
- memset(buf, '*', sizeof(buf));
- /* Three bytes too short. */
- iret = strerror_r(-2, buf, strlen("Unknown error: -2") - 2);
- CHECK(strcmp(buf, "Unknown error:") == 0);
- CHECK(iret == EINVAL);
-
- memset(buf, '*', sizeof(buf));
- /* One byte too short. */
- iret = strerror_r(12345, buf, strlen("Unknown error: 12345"));
- CHECK(strcmp(buf, "Unknown error: 1234") == 0);
- CHECK(iret == EINVAL);
-
- /*
- * strerror_r() success tests.
- */
- memset(buf, '*', sizeof(buf));
- iret = strerror_r(0, buf, sizeof(buf));
- CHECK(strcmp(buf, "No error: 0") == 0);
- CHECK(iret == 0);
-
- memset(buf, '*', sizeof(buf));
- iret = strerror_r(EDEADLK, buf, sizeof(buf));
- CHECK(strcmp(buf, "Resource deadlock avoided") == 0);
- CHECK(iret == 0);
-
- memset(buf, '*', sizeof(buf));
- iret = strerror_r(EPROCLIM, buf, sizeof(buf));
- CHECK(strcmp(buf, "Too many processes") == 0);
- CHECK(iret == 0);
-
- return exit_status;
-}
diff --git a/tools/regression/lib/libc/string/test-strerror.t b/tools/regression/lib/libc/string/test-strerror.t
deleted file mode 100644
index 8bdfd03..0000000
--- a/tools/regression/lib/libc/string/test-strerror.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/libc/string/test-wcscasecmp.c b/tools/regression/lib/libc/string/test-wcscasecmp.c
deleted file mode 100644
index 0236507..0000000
--- a/tools/regression/lib/libc/string/test-wcscasecmp.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * 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>
-
-int
-main(int argc, char *argv[])
-{
-
- printf("1..6\n");
-
- setlocale(LC_CTYPE, "C");
-
- assert(wcscasecmp(L"", L"") == 0);
- assert(wcsncasecmp(L"", L"", 50) == 0);
- assert(wcsncasecmp(L"", L"", 0) == 0);
- printf("ok 1 - wcscasecmp\n");
-
- assert(wcscasecmp(L"abc", L"abc") == 0);
- assert(wcscasecmp(L"ABC", L"ABC") == 0);
- assert(wcscasecmp(L"abc", L"ABC") == 0);
- assert(wcscasecmp(L"ABC", L"abc") == 0);
- printf("ok 2 - wcscasecmp\n");
-
- assert(wcscasecmp(L"abc", L"xyz") < 0);
- assert(wcscasecmp(L"ABC", L"xyz") < 0);
- assert(wcscasecmp(L"abc", L"XYZ") < 0);
- assert(wcscasecmp(L"ABC", L"XYZ") < 0);
- assert(wcscasecmp(L"xyz", L"abc") > 0);
- assert(wcscasecmp(L"XYZ", L"abc") > 0);
- assert(wcscasecmp(L"xyz", L"ABC") > 0);
- assert(wcscasecmp(L"XYZ", L"ABC") > 0);
- printf("ok 3 - wcscasecmp\n");
-
- assert(wcscasecmp(L"abc", L"ABCD") < 0);
- assert(wcscasecmp(L"ABC", L"abcd") < 0);
- assert(wcscasecmp(L"abcd", L"ABC") > 0);
- assert(wcscasecmp(L"ABCD", L"abc") > 0);
- printf("ok 4 - wcscasecmp\n");
-
- assert(wcsncasecmp(L"abc", L"ABCD", 4) < 0);
- assert(wcsncasecmp(L"ABC", L"abcd", 4) < 0);
- assert(wcsncasecmp(L"abcd", L"ABC", 4) > 0);
- assert(wcsncasecmp(L"ABCD", L"abc", 4) > 0);
- assert(wcsncasecmp(L"abc", L"ABCD", 3) == 0);
- assert(wcsncasecmp(L"ABC", L"abcd", 3) == 0);
- printf("ok 5 - wcsncasecmp\n");
-
- assert(wcscasecmp(L"λ", L"Λ") != 0);
- setlocale(LC_CTYPE, "el_GR.UTF-8");
- assert(wcscasecmp(L"λ", L"Λ") == 0);
- assert(wcscasecmp(L"λ", L"Ω") < 0);
- assert(wcscasecmp(L"Ω", L"λ") > 0);
- printf("ok 6 - greek\n");
-
- exit(0);
-}
OpenPOWER on IntegriCloud