From owner-svn-src-all@FreeBSD.ORG Sat Feb 28 06:34:05 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 173041065676; Sat, 28 Feb 2009 06:34:05 +0000 (UTC) (envelope-from das@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 032588FC0A; Sat, 28 Feb 2009 06:34:05 +0000 (UTC) (envelope-from das@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1S6Y4JI097886; Sat, 28 Feb 2009 06:34:04 GMT (envelope-from das@svn.freebsd.org) Received: (from das@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1S6Y44R097882; Sat, 28 Feb 2009 06:34:04 GMT (envelope-from das@svn.freebsd.org) Message-Id: <200902280634.n1S6Y44R097882@svn.freebsd.org> From: David Schultz Date: Sat, 28 Feb 2009 06:34:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189140 - head/tools/regression/lib/libc/string X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Feb 2009 06:34:06 -0000 Author: das Date: Sat Feb 28 06:34:04 2009 New Revision: 189140 URL: http://svn.freebsd.org/changeset/base/189140 Log: Tests for wcscasecmp(), wcsnlen(), and stpncpy(). Added: head/tools/regression/lib/libc/string/test-stpncpy.c (contents, props changed) head/tools/regression/lib/libc/string/test-wcscasecmp.c (contents, props changed) head/tools/regression/lib/libc/string/test-wcsnlen.c (contents, props changed) Modified: head/tools/regression/lib/libc/string/Makefile Modified: head/tools/regression/lib/libc/string/Makefile ============================================================================== --- head/tools/regression/lib/libc/string/Makefile Sat Feb 28 06:27:23 2009 (r189139) +++ head/tools/regression/lib/libc/string/Makefile Sat Feb 28 06:34:04 2009 (r189140) @@ -4,7 +4,7 @@ CFLAGS+= -I/usr/local/include LDFLAGS+= -L/usr/local/lib LDLIBS= -ltap -TESTS= test-strerror +TESTS= test-stpncpy test-strerror test-wcscasecmp test-wcsnlen .PHONY: tests tests: ${TESTS} Added: head/tools/regression/lib/libc/string/test-stpncpy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/lib/libc/string/test-stpncpy.c Sat Feb 28 06:34:04 2009 (r189140) @@ -0,0 +1,93 @@ +/*- + * Copyright (c) 2009 David Schultz + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include + +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'); + } + } + } +} + +int +main(int argc, char *argv[]) +{ + + printf("1..3\n"); + + test_stpncpy(""); + printf("ok 1 - stpncpy\n"); + test_stpncpy("foo"); + printf("ok 2 - stpncpy\n"); + test_stpncpy("glorp"); + printf("ok 3 - stpncpy\n"); + + exit(0); +} Added: head/tools/regression/lib/libc/string/test-wcscasecmp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/lib/libc/string/test-wcscasecmp.c Sat Feb 28 06:34:04 2009 (r189140) @@ -0,0 +1,88 @@ +/*- + * Copyright (c) 2009 David Schultz + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include + +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); +} Added: head/tools/regression/lib/libc/string/test-wcsnlen.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/lib/libc/string/test-wcsnlen.c Sat Feb 28 06:34:04 2009 (r189140) @@ -0,0 +1,87 @@ +/*- + * Copyright (c) 2009 David Schultz + * 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 +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +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); + 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_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; + assert(wcsnlen(s1, bufsize) == len); + } + } +} + +int +main(int argc, char *argv[]) +{ + + printf("1..3\n"); + + test_wcsnlen(L""); + printf("ok 1 - wcsnlen\n"); + test_wcsnlen(L"foo"); + printf("ok 2 - wcsnlen\n"); + test_wcsnlen(L"glorp"); + printf("ok 3 - wcsnlen\n"); + + exit(0); +}