From nobody Thu Feb 16 00:41:30 2023 X-Original-To: dev-commits-src-main@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 4PHGNB514Gz3rZ4H; Thu, 16 Feb 2023 00:41:30 +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 4PHGNB49CSz43jT; Thu, 16 Feb 2023 00:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676508090; 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=ThiVv9UPwgEJqTxUFmX8ltfigjH91dSH/OAfOVnrJH4=; b=wUCTd8IbSklk7QEprCwLYfrEkyS58CZhhb2Buog6tF8u2sbLwNTwpD2kL16i1iVaIedqBH 9WOrGIuCb4vuJ+jc4WuH6p85zY1rChEiV4QZHf6hDTLEf9xFngd7FQop3fEJQ6oQH/YYs5 N7sRsw3M7SGda2iDdIBnwN+K6UgW3azIQveMx8N3GLXWGmrBouFm9LEbOaeZx6XOwc3ing Gcmojowd5js/YnOF60yD6OUTWQbXGomcWyqQihPjcRHxP9ywe6H1oHiTGbPTsCf3VwEK3w 97FvLlWTjvv3f+VXdA+oipS2SrLuedsmJV7RxVCC02mSm8dg3A0RfoSGr18FvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676508090; 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=ThiVv9UPwgEJqTxUFmX8ltfigjH91dSH/OAfOVnrJH4=; b=xT29iIJ6mPsFgGuAOhr4I+hmnF7sIXIHa0IKBU6f2T0qXzteY9kpEwFPluask345l4n9ML i78vtRRowKDnPIjFpy/6PriQZSoQA2zQJzOr6tl2fiYVNyxDB+OMYOFODRr61jMnxR8Zpz awgekJcaOybz51gVUGdSrD68W21+4cIfgCD1tTuCWudsft0Y0HBIUMnjjvCCkhgZrxoXFa 7XyFZk7R9a8HGJQHrDYm815HAP3fmjw6HUOY4b5lUt1ZXENjHCZqD2C9MSTrgRyp1OJulP UMszqpZUlSdltIciH+iT08yOsdkrD0kJ4vQV2ZpaSwweuO7J6mF16f1IXPVenA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676508090; a=rsa-sha256; cv=none; b=hpqwDpljLXY7ZaPhi1eSfejhmaTiXS/gMmsOkZpSCdPzhgGYqomis4QBaItBrsN9izg7Yq 0uwD00V9BeYXKBgztZlzUhI+E/foM7TPa2f9/9m9thJ2H61IPz0CNsIimZDVQsnQ1nI7hh kExZbLjJDvpe9sttbnjgimTKhwykSnoqu4ZlXxzOlEUAaj58EGgbB3Ymh5Hz96+xbewMhp ZHY064gOSIdzqiyt5ulCHGsxrGiwi9jjFv3ip5ueVd232rDMROZfAHXdoZooNJ2YkQHKYU TaA4JSyYebFrUzRnZwKEShLY9svN4pVvcXtjsIArXEpEzPnH7s9CJ47QDxxjlw== 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 4PHGNB2wLXzkfV; Thu, 16 Feb 2023 00:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31G0fUT8098167; Thu, 16 Feb 2023 00:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G0fUi7098166; Thu, 16 Feb 2023 00:41:30 GMT (envelope-from git) Date: Thu, 16 Feb 2023 00:41:30 GMT Message-Id: <202302160041.31G0fUi7098166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 5c870e1b4894 - main - wc: Improve test coverage. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c870e1b48948a283c963ecb88780e4e0406ac1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5c870e1b48948a283c963ecb88780e4e0406ac1e commit 5c870e1b48948a283c963ecb88780e4e0406ac1e Author: Dag-Erling Smørgrav AuthorDate: 2023-02-16 00:40:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-16 00:40:45 +0000 wc: Improve test coverage. * Add a test that causes mbrtowc() to return 0. * Add a test that causes mbrtowc() to return -2. Sponsored by: Klara, Inc. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38605 --- usr.bin/wc/tests/wc_test.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/usr.bin/wc/tests/wc_test.sh b/usr.bin/wc/tests/wc_test.sh index 574f2daacaca..70eb5f5a2b37 100755 --- a/usr.bin/wc/tests/wc_test.sh +++ b/usr.bin/wc/tests/wc_test.sh @@ -11,6 +11,11 @@ export LC_CTYPE=C.UTF-8 export LC_MESSAGES=C +# +# Size of wc's read buffer. +# +MAXBSIZE=65536 + # # Sample text containing multibyte characters # @@ -136,6 +141,50 @@ multiline_repeated_body() atf_check_wc foo $((tvl*c)) $((tvw*c)) $((tvc*c)) $((tvm*c)) } +atf_test_case nul +nul_head() +{ + atf_set "descr" "Input containing NUL" +} +nul_body() +{ + printf "a\0b\n" >foo + atf_check_wc foo 1 1 4 +} + +atf_test_case poop +poop_head() +{ + atf_set "descr" "Multibyte sequence across buffer boundary" +} +poop_body() +{ + local l=0 w=0 c=0 m=0 + # The code below produces a stream of 4-byte UTF-8 sequences + # aligned on 5-byte boundaries, ensuring that the first full + # read of length MAXBSIZE will end in a partial sequence — + # unless MAXBSIZE is a multiple of 5 (not possible since it's + # a power of 2) or one less than a multiple of 5 (e.g. 2^18 = + # 262,144 = (52429 * 5) - 1) in which case we prepend a single + # newline to push our sequence out of phase. + atf_check_not_equal 0 $((MAXBSIZE % 5)) + :>foo + if [ $((MAXBSIZE % 5)) -eq 4 ] ; then + printf "\n" + l=$((l + 1)) + c=$((c + 1)) + m=$((m + 1)) + fi >>foo + while [ $c -le $MAXBSIZE ] ; do + printf "💩.💩.💩.💩.💩.💩.💩.💩.💩.💩.💩.💩.💩.💩.💩.💩\n" + l=$((l + 1)) + w=$((w + 1)) + c=$((c + 80)) # 80 bytes + m=$((m + 32)) # 32 multibyte characters + done >>foo + atf_check_wc foo $l $w $c $m +} + atf_test_case total total_head() { @@ -190,6 +239,8 @@ atf_init_test_cases() atf_add_test_case invalid atf_add_test_case multiline atf_add_test_case multiline_repeated + atf_add_test_case nul + atf_add_test_case poop atf_add_test_case total atf_add_test_case unterminated atf_add_test_case usage