From nobody Thu Dec 28 17:20:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1FdB3bTlz56CDr; Thu, 28 Dec 2023 17:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1FdB1d9Jz3ZjH; Thu, 28 Dec 2023 17:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mkarzoyFChjT2Y3jeh8X4CRhNlg4nCMpxp/ZjCDsMis=; b=UIXubeV3uQIEMKatK+UaxuFaaZ1BV4pgRHPJQJqeXEq8tEBM1V0q4ZAPD+19TIh2PJY78V T98LRobwI+0JN8FVBxH2llZN6p9/gXph15PK0xmfbjLS1QqzJIrX7utt+rHwWM5ZaOx4ct s18pm5EAvhXgzEcHd6B9CgT9e8eETIfYGhRD/OhvMcOMVBqXzhyB4QRKrJBinfKU+WP07Z uL9+7pnCCWzgZMlx77rpkacPL2YrJH8h82t3zDmGJyY+X7axQbVytRxRq2d7dQCoauPwJx jwLeXdmKuxwE0l98Xocn9+kXkJuV8z58qvDg2PobVUgKtGyzT25MAJjGAlI46g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703784014; a=rsa-sha256; cv=none; b=M2Qwfs/vMdDcUCqbIMolw8+cAWAAolpat7W9aEY0qzoQeVNuATQAPH5vFc8bD05ucBuhxw Y1FS+vfg/u0sKzwzCwzvSrBmUgtJvwhzPWhGJciD01ZSO1ukqd1iwtBIj2t7yaE1S9Rek0 r2t3+yc+eMEpicJQ92eLDLLyIqgZ5AT0aS9lkJ8rW6bBbKzY/3bgkSXE5C+vz+6KH3qXvD FgHMk8OV2F4WFQ6e7scjQJlz2g5nBXtJ5IJRm7KcfhhZYO6hZQVKEAY4940l/P4nD6gTZt jFZad2KHsXQhmtqUjo0ut2vNJOTMTPCUUyVoCDgVZXFnpO0UqlrhJD3TX/3AeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mkarzoyFChjT2Y3jeh8X4CRhNlg4nCMpxp/ZjCDsMis=; b=a8+mnH8iUoAR3oa4QNVPHZQten+p1HQ9jOJAH6kL1NX4vvApF43OgJA554aC+MgI1vwHO8 AGjmkT2Ah/5AY9UXxZmaGg+9Cl5MSPMQQXlN682OJFnVD8HsBMplFeBtrUZQ/FrwnEpp8V TadzignPj3G0paGQtQ7peNkODCUFvieX58SmjB0KgXRlSMEUMWSPie80wrZ5L1Ssf5On14 MOtr2zVfcSc+4ZuI7qTtOFVeyJtzX2+vqblQpNW0DgRnFmPxyh1q2S73c2GtVKxNTpUHwn b5+SV80lmamc0KfiSGCMUVeNcARcx13CdXXrLd4N/fn0L0DHyvAf65n/c4RtKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1FdB0khgzWw5; Thu, 28 Dec 2023 17:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSHKEwR080042; Thu, 28 Dec 2023 17:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSHKECA080034; Thu, 28 Dec 2023 17:20:14 GMT (envelope-from git) Date: Thu, 28 Dec 2023 17:20:14 GMT Message-Id: <202312281720.3BSHKECA080034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 08ad297599ee - stable/14 - lib/libc/tests/string/strcspn_test.c: add test for correct match order List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08ad297599ee6c40b4346699dac81d71f1933f18 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=08ad297599ee6c40b4346699dac81d71f1933f18 commit 08ad297599ee6c40b4346699dac81d71f1933f18 Author: Robert Clausecker AuthorDate: 2023-12-19 16:27:24 +0000 Commit: Robert Clausecker CommitDate: 2023-12-28 17:02:41 +0000 lib/libc/tests/string/strcspn_test.c: add test for correct match order This new unit test verifies that if there are multiple matches, the first match is returned, ignoring later matches. Approved by: mjg (blanket, via IRC) MFC after: 1 week MFC to: stable/14 (cherry picked from commit a0ecf2224ea35d029d33541878f0eee42f5fd84f) --- lib/libc/tests/string/strcspn_test.c | 51 +++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/string/strcspn_test.c b/lib/libc/tests/string/strcspn_test.c index 6cb2a04d3e64..293fc2bc8d4e 100644 --- a/lib/libc/tests/string/strcspn_test.c +++ b/lib/libc/tests/string/strcspn_test.c @@ -150,7 +150,7 @@ ATF_TC_BODY(set_alignments, tc) #ifndef STRSPN /* test all positions in which set could match buf */ static void -test_match_positions(char *buf, char *set, size_t buflen, size_t setlen) +test_match_positions(char *buf, char *set, size_t buflen, size_t setlen) { size_t i, j, outcome; @@ -206,6 +206,54 @@ ATF_TC_BODY(match_positions, tc) test_match_positions(buf, set, 16, 8); test_match_positions(buf, set, 8, 8); } + +/* if there are two matches, check that the earlier match is taken */ +static void +test_match_order(char *buf, char *set, size_t buflen, size_t setlen) +{ + size_t i, j, k, l, outcome; + + memset(buf, '-', buflen); + + for (i = 0; i < setlen; i++) + set[i] = 'A' + i; + + buf[buflen] = '\0'; + set[setlen] = '\0'; + + for (i = 0; i < setlen; i++) + for (j = 0; j < setlen; j++) + for (k = 0; k + 1 < buflen; k++) + for (l = k + 1; l < buflen; l++) { + buf[k] = set[i]; + buf[l] = set[j]; + outcome = strcspn(buf, set); + ATF_CHECK_EQ_MSG(k, outcome, + "strcspn(\"%s\", \"%s\") = %zu != %zu", + buf, set, outcome, k); + buf[k] = '-'; + buf[l] = '-'; + } +} + +ATF_TC_WITHOUT_HEAD(match_order); +ATF_TC_BODY(match_order, tc) +{ + char buf[33], set[65]; + + test_match_order(buf, set, 32, 64); + test_match_order(buf, set, 16, 64); + test_match_order(buf, set, 8, 64); + test_match_order(buf, set, 32, 32); + test_match_order(buf, set, 16, 32); + test_match_order(buf, set, 8, 32); + test_match_order(buf, set, 32, 16); + test_match_order(buf, set, 16, 16); + test_match_order(buf, set, 8, 16); + test_match_order(buf, set, 32, 8); + test_match_order(buf, set, 16, 8); + test_match_order(buf, set, 8, 8); +} #endif /* !defined(STRSPN) */ ATF_TP_ADD_TCS(tp) @@ -214,6 +262,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, set_alignments); #ifndef STRSPN ATF_TP_ADD_TC(tp, match_positions); + ATF_TP_ADD_TC(tp, match_order); #endif return (atf_no_error());