From nobody Sat Sep 23 18:22:36 2023 X-Original-To: dev-commits-src-all@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 4RtHYS48Pqz4v3cG; Sat, 23 Sep 2023 18:22:36 +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 4RtHYS3TPnz4lML; Sat, 23 Sep 2023 18:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695493356; 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=FbWfn1yOZ5n9HEs+iIsTs0K1TMaf7ysdWzDkkktnLdQ=; b=hG0vznIbybKjtvsrUxVQiRvnhJ5jKqafd2Un2fg0w4riaVRMf2Rh4yvhVQL0u2tmaufmdS 1u0niZPvz4PTFBm/eRENez15MHHKiIIja+C0c63KewjriTtk2NPgAipYkUXGffwhxNLlhN /gNV6FLoLWme/QjvtghlMbnLRwWUn4G1XNt83XP4hPC3kMsdknT3P2AZl+5WLwJq92ipjB rj5MPwyoFozZffGf9/SF9w/eRzgBLloiieymyNgI4VqpnlB4B0LU2wxzJJ1baK/eYPW3d1 1pmcrnraWYR+fwWKzdYZIM/CBlz8YGHeXRjDyo6HyPXx0+0aX6bbPFmFLTGAdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695493356; a=rsa-sha256; cv=none; b=tg60HzVMEJ+BJBdnnI07reprobtgNHRAY/p+/BR04Uqh279Q35K14PiDjAuDAhlMDaLd7o 3dWJY3ZI5SjAuhTnq2fTiyboRNtkXVQCVd+x16l/dyoUHeImvScmJ3zD0xWRZRehryUDRl VqOfrx68fczjB6sDcqio1i+9HhudZxPSLuJtPn/S2OFnjCJKRLlZUkqAaAGzBVk89G4UtH JwbCkJ7kCUz77om4Om8GwNNAuPJ5f+K1e/9AssUeVSM5VfRJZBny0IWVffj8heqNC4EeTZ FOmfVQDeTPUbjYZq/oVLGb5A4EAaFZhnCrJeBhGwFWrzRgj0+UKoB/9WjhV2yA== 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=1695493356; 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=FbWfn1yOZ5n9HEs+iIsTs0K1TMaf7ysdWzDkkktnLdQ=; b=lhVU1Nhwuuzak7fG+78TWL8YNkt3GUQKHgtRc4yBx/T5FcFrAciPwNOh+gQ1r0ScAXhlk8 RaYGlAfL99maV/y5VmOs7TPcKWm06xR7zV4SjiBTTmvk0YkyJOJHKgiVkwO2fECy6eXdEc TAguN/NerueZmv44A+P9hQIZfGvzKQ3yFccW6lg+IJzzaq3O7U+JjwcFGgCkBL6sjPuNW0 gDDUoWNUrUWH080MV3oaR7kaCqQjwMnZ3WRMNFUGD489enW9Dbsn22TrdpMWw5uuDL0RfW YXRJu8/kHOicG0ID/JD6r0f/amGot9qnGynkWoisCWbcHQSG/ZsH8pe11F2seg== 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 4RtHYS2ZJCzVT; Sat, 23 Sep 2023 18:22:36 +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 38NIMaJq004288; Sat, 23 Sep 2023 18:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NIMavp004285; Sat, 23 Sep 2023 18:22:36 GMT (envelope-from git) Date: Sat, 23 Sep 2023 18:22:36 GMT Message-Id: <202309231822.38NIMavp004285@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: efbccec3e072 - stable/14 - lib/libc/tests/string/strcspn_test.c: extend tests to catch previous bug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: efbccec3e0722d25601bc48a5dd62b22455381b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=efbccec3e0722d25601bc48a5dd62b22455381b3 commit efbccec3e0722d25601bc48a5dd62b22455381b3 Author: Robert Clausecker AuthorDate: 2023-09-12 02:48:58 +0000 Commit: Robert Clausecker CommitDate: 2023-09-23 18:21:42 +0000 lib/libc/tests/string/strcspn_test.c: extend tests to catch previous bug This extends the strcspn() unit tests to catch mistakes in the implementation that only appear when a mismatch occurs in a certain position of the string against a certain position of the set. See also: 52d4a4d4e0dedc72bc33082a3f84c2d0fd6f2cbb Sponsored by: The FreeBSD Foundation Approved by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41821 (cherry picked from commit 601fd768cfd599518f7f9d30592763d1279d336d) --- lib/libc/tests/string/strcspn_test.c | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/lib/libc/tests/string/strcspn_test.c b/lib/libc/tests/string/strcspn_test.c index abacdcbbf18a..722d20025535 100644 --- a/lib/libc/tests/string/strcspn_test.c +++ b/lib/libc/tests/string/strcspn_test.c @@ -148,10 +148,74 @@ ATF_TC_BODY(set_alignments, tc) test_set_alignments(buf, 30, NOMATCH); } +#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) +{ + size_t i, j, outcome; + + memset(buf, '-', buflen); + + for (i = 0; i < setlen; i++) + set[i] = 'A' + i; + + buf[buflen] = '\0'; + set[setlen] = '\0'; + + /* + * Check for (mis)match at buffer position i + * against set position j. + */ + for (i = 0; i < buflen; i++) { + for (j = 0; j < setlen; j++) { + buf[i] = set[j]; + + outcome = strcspn(buf, set); + ATF_CHECK_EQ_MSG(i, outcome, + "strcspn(\"%s\", \"%s\") = %zu != %zu", + buf, set, outcome, i); + } + + buf[i] = '-'; + } +} + +ATF_TC_WITHOUT_HEAD(match_positions); +ATF_TC_BODY(match_positions, tc) +{ + char buf[129], set[65]; + + test_match_positions(buf, set, 128, 64); + test_match_positions(buf, set, 64, 64); + test_match_positions(buf, set, 32, 64); + test_match_positions(buf, set, 16, 64); + test_match_positions(buf, set, 8, 64); + test_match_positions(buf, set, 128, 32); + test_match_positions(buf, set, 64, 32); + test_match_positions(buf, set, 32, 32); + test_match_positions(buf, set, 16, 32); + test_match_positions(buf, set, 8, 32); + test_match_positions(buf, set, 128, 16); + test_match_positions(buf, set, 64, 16); + test_match_positions(buf, set, 32, 16); + test_match_positions(buf, set, 16, 16); + test_match_positions(buf, set, 8, 16); + test_match_positions(buf, set, 128, 8); + test_match_positions(buf, set, 64, 8); + test_match_positions(buf, set, 32, 8); + test_match_positions(buf, set, 16, 8); + test_match_positions(buf, set, 8, 8); +} +#endif /* !defined(STRSPN) */ + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, buf_alignments); ATF_TP_ADD_TC(tp, set_alignments); +#ifndef STRSPN + ATF_TP_ADD_TC(tp, match_positions); +#endif return (atf_no_error()); }