upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/libc/tests/string: derive strspn(3) tests from strcspn(3) tests

Browse source 
To cover the new optimised amd64 strspn(3) SIMD implementation, extend
the previously written strcspn(3) unit test to also cover strspn(3).

Sponsored by:	The FreeBSD Foundation
Approved by:	mjg
MFC after:	1 week
MFC to:		stable/14
Differential Revision:	https://reviews.freebsd.org/D41567

(cherry picked from commit 468adddd75f6461fcdd2151122d85879ec592a5b)
This commit is contained in:
Robert Clausecker 2023-08-21 15:30:23 +00:00
parent 08eab36169
commit 73883def32
3 changed files with 54 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libc/tests/string/Makefile
View file

@ -13,6 +13,7 @@ ATF_TESTS_C+= memset_s_test
ATF_TESTS_C+= stpncpy_test
ATF_TESTS_C+= strcspn_test
ATF_TESTS_C+= strerror2_test
ATF_TESTS_C+= strspn_test
ATF_TESTS_C+= strverscmp_test
ATF_TESTS_C+= strxfrm_test
ATF_TESTS_C+= wcscasecmp_test
@ -34,7 +35,6 @@ NETBSD_ATF_TESTS_C+= strerror_test
NETBSD_ATF_TESTS_C+= strlen_test
NETBSD_ATF_TESTS_C+= strpbrk_test
NETBSD_ATF_TESTS_C+= strrchr_test
NETBSD_ATF_TESTS_C+= strspn_test
NETBSD_ATF_TESTS_C+= swab_test
SRCS.strerror2_test= strerror_test.c

26
lib/libc/tests/string/strcspn_test.c
View file

@ -42,6 +42,12 @@ enum {
enum { NOMATCH, MATCH };
#ifdef STRSPN
#define STRXSPN strspn
#else
#define STRXSPN strcspn
#endif
static void
testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match)
{
@ -50,7 +56,11 @@ testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match)
assert(setlen < UCHAR_MAX - 2);
for (i = 0; i < buflen; i++)
#ifdef STRSPN
buf[i] = UCHAR_MAX - i % (setlen > 0 ? setlen : 1);
#else /* strcspn */
buf[i] = 1 + i % (UCHAR_MAX - setlen - 1);
#endif
buf[i] = '\0';
@ -59,15 +69,25 @@ testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match)
set[i] = '\0';
#ifdef STRSPN
if (setlen == 0)
expected = 0;
else if (want_match == MATCH && buflen > 0) {
buf[buflen - 1] = 1;
expected = buflen - 1;
} else
expected = buflen;
#else /* strcspn */
if (want_match == MATCH && buflen > 0 && setlen > 0) {
buf[buflen - 1] = UCHAR_MAX;
expected = buflen - 1;
} else
expected = buflen;
#endif
outcome = strcspn(buf, set);
ATF_CHECK_EQ_MSG(expected, outcome, "strcspn(%p[%zu], %p[%zu]) = %zu != %zu",
buf, buflen, set, setlen, outcome, expected);
outcome = STRXSPN(buf, set);
ATF_CHECK_EQ_MSG(expected, outcome, "%s(%p[%zu], %p[%zu]) = %zu != %zu",
__XSTRING(STRXSPN), buf, buflen, set, setlen, outcome, expected);
}
/* test set with all alignments and lengths of buf */

30
lib/libc/tests/string/strspn_test.c Normal file
View file

@ -0,0 +1,30 @@
/*-
* Copyright (c) 2023 The FreeBSD Foundation
*
* This software was developed by Robert Clausecker <fuz@FreeBSD.org>
* under sponsorship from the FreeBSD Foundation.
*
* 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
*/
#define STRSPN
#include "strcspn_test.c"