Date: Sun, 8 Nov 2015 07:53:31 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290539 - in head: lib/libc/tests/string tools/regression/lib/libc/string Message-ID: <201511080753.tA87rVa4072795@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Nov 8 07:53:31 2015 New Revision: 290539 URL: https://svnweb.freebsd.org/changeset/base/290539 Log: Integrate tools/regression/lib/libc/string into the FreeBSD test suite as lib/libc/tests/string MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Added: head/lib/libc/tests/string/stpncpy_test.c - copied, changed from r290538, head/tools/regression/lib/libc/string/test-stpncpy.c head/lib/libc/tests/string/strerror_test.c - copied, changed from r290538, head/tools/regression/lib/libc/string/test-strerror.c head/lib/libc/tests/string/wcscasecmp_test.c - copied, changed from r290538, head/tools/regression/lib/libc/string/test-wcscasecmp.c head/lib/libc/tests/string/wcsnlen_test.c - copied, changed from r290538, head/tools/regression/lib/libc/string/test-wcsnlen.c Deleted: head/tools/regression/lib/libc/string/ Modified: head/lib/libc/tests/string/Makefile Modified: head/lib/libc/tests/string/Makefile ============================================================================== --- head/lib/libc/tests/string/Makefile Sun Nov 8 07:03:17 2015 (r290538) +++ head/lib/libc/tests/string/Makefile Sun Nov 8 07:53:31 2015 (r290539) @@ -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 # TODO: popcount, stresep @@ -20,6 +23,8 @@ 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" LDADD.memchr_test+= -lmd Copied and modified: head/lib/libc/tests/string/stpncpy_test.c (from r290538, head/tools/regression/lib/libc/string/test-stpncpy.c) ============================================================================== --- head/tools/regression/lib/libc/string/test-stpncpy.c Sun Nov 8 07:03:17 2015 (r290538, copy source) +++ head/lib/libc/tests/string/stpncpy_test.c Sun Nov 8 07:53:31 2015 (r290539) @@ -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()); } Copied and modified: head/lib/libc/tests/string/strerror_test.c (from r290538, head/tools/regression/lib/libc/string/test-strerror.c) ============================================================================== --- head/tools/regression/lib/libc/string/test-strerror.c Sun Nov 8 07:03:17 2015 (r290538, copy source) +++ head/lib/libc/tests/string/strerror_test.c Sun Nov 8 07:53:31 2015 (r290539) @@ -33,115 +33,174 @@ #include <stdlib.h> #include <string.h> -static int test_count = 1; -static int exit_status = EXIT_SUCCESS; +#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) +{ -#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); + ATF_CHECK(strcmp(sret, buf) == 0); + ATF_CHECK(errno == EINVAL); +} + +ATF_TC_WITHOUT_HEAD(strerror_no_error); +ATF_TC_BODY(strerror_no_error, tc) +{ - /* - * strerror() success tests. - */ errno = 0; sret = strerror(0); - CHECK(strcmp(sret, "No error: 0") == 0); - CHECK(errno == 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); - CHECK(strcmp(sret, "Operation not permitted") == 0); - CHECK(errno == 0); + 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); - CHECK(strcmp(sret, "Protocol family not supported") == 0); - CHECK(errno == 0); + 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); - CHECK(errno == 0); + ATF_CHECK(errno == 0); +} + +ATF_TC_WITHOUT_HEAD(strerror_r__unknown_error); +ATF_TC_BODY(strerror_r__unknown_error, tc) +{ - /* - * 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); + 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")); - CHECK(strcmp(buf, "Operation not permitte") == 0); - CHECK(iret == ERANGE); + 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")); - CHECK(strcmp(buf, "Unknown error: -") == 0); - CHECK(iret == EINVAL); + 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); - CHECK(strcmp(buf, "Unknown error: ") == 0); - CHECK(iret == EINVAL); + 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); - CHECK(strcmp(buf, "Unknown error:") == 0); - CHECK(iret == EINVAL); + 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")); - CHECK(strcmp(buf, "Unknown error: 1234") == 0); - CHECK(iret == EINVAL); + 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) +{ - /* - * 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); + 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)); - CHECK(strcmp(buf, "Resource deadlock avoided") == 0); - CHECK(iret == 0); + 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)); - CHECK(strcmp(buf, "Too many processes") == 0); - CHECK(iret == 0); + 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 exit_status; + return (atf_no_error()); } Copied and modified: head/lib/libc/tests/string/wcscasecmp_test.c (from r290538, head/tools/regression/lib/libc/string/test-wcscasecmp.c) ============================================================================== --- head/tools/regression/lib/libc/string/test-wcscasecmp.c Sun Nov 8 07:03:17 2015 (r290538, copy source) +++ head/lib/libc/tests/string/wcscasecmp_test.c Sun Nov 8 07:53:31 2015 (r290539) @@ -34,55 +34,95 @@ __FBSDID("$FreeBSD$"); #include <wchar.h> #include <wctype.h> -int -main(int argc, char *argv[]) +#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) { - printf("1..6\n"); + 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) +{ - setlocale(LC_CTYPE, "C"); + 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) +{ - 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"); + 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); - exit(0); + return (atf_no_error()); } Copied and modified: head/lib/libc/tests/string/wcsnlen_test.c (from r290538, head/tools/regression/lib/libc/string/test-wcsnlen.c) ============================================================================== --- head/tools/regression/lib/libc/string/test-wcsnlen.c Sun Nov 8 07:03:17 2015 (r290538, copy source) +++ head/lib/libc/tests/string/wcsnlen_test.c Sun Nov 8 07:53:31 2015 (r290539) @@ -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()); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511080753.tA87rVa4072795>