From nobody Thu Jan 30 21:38:24 2025 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 4YkXSw4qd9z5mp9y; Thu, 30 Jan 2025 21:38:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YkXSw4GgRz3Rlw; Thu, 30 Jan 2025 21:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738273104; 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=mr1EykmKk8V9M6Nr1DHXAPTJFzLMrysODk2a5YCB3GI=; b=Il7gPQvOyQBvALiO5wM5hTVYJtmHjUQEwo2uTf7ymX0TPjUXxc5XoEc4v2XcEUIlnbO58F Tw2AQRqNEjDtyBPgg0FegUdjk1aOQAwahINtiI3ig/9tgOMa39gFCHKVzRw4m4jgD7YsTL 42+PA5YfHR1oTavGclo38lFoOvb1NzrYdhw4VQVVbP84Pfw+ppeRnssKnJGMyZdkQdNk9u UJ/9WqJmcH4a6DVerOG0RKSCNbtZ9JWD4Hq/OjIIbtipiRU7Xy/12Z3Kx64XHv6quszhRd gD+z75P5r0KMiUpXg7nB/62YLSjNm99cLbUkQHQr5NuJ9coRDodLRk3hDWLOpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738273104; 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=mr1EykmKk8V9M6Nr1DHXAPTJFzLMrysODk2a5YCB3GI=; b=ogWIuTl6YWjIQv6K/le2bYQ6vofR+ZoNi+S4xb/xNkhDdCbRKE9jjPAt+78xcoW9QsS6hT RcJ5+/AScK2vQj4wr+ABBdJqwOKwNeV5g29GpPVkT9kR25eiE6dcKxrzQ9aaAoKewYjWws w+yaQPtUZSZD+lV62XazTRE9ymXKtgMNuUAgmqwFIjdLMo+XqbDjoxaYuiZN07iVrAD6qg CYuP7lcntxQxGdJlh+ToF9k4pU5anVd3TrxFw0CSwHqXGmGgN2VVe+IGnyBYL2qSEo/e0W XiJIlU6fzheAdlT0KhJYqaoeEjMsRe1g00PD9HX9fxd2jtkxGWNlm/yqxZCHnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738273104; a=rsa-sha256; cv=none; b=rhqqkPMfL9nw7xzJBNR7BY84W5HkMArsumXXJT1s8YEBNgk1ZZPrLDgjq9YnMUeVkNHRtt Msvws2grE8jihcnPi/dQBpzD0+QQ1wW4attd8cQTUno+W1P9sHVPkDQj5jjAw0KTFxcJ5h y2z/dIROJAZT+ZfIxlKGcihUIY/pXxip6/48ZOJjshGHD/8+vhl6rvonaSk0LJN/6GiNne nIHvPcS1qrFTBzRos4WZW5urOM53lrDEv6NPbK91JsrD8hAMHGr2Qp9CFK4P/aMMgt5naC ZcT8v6ABZXmfPO2p3wtvuJkXI2Q/NixdoWUv0JUXnjxL7V10JtFbgHBd6bmw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkXSw3rz3z155H; Thu, 30 Jan 2025 21:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50ULcOa2062815; Thu, 30 Jan 2025 21:38:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ULcOpi062812; Thu, 30 Jan 2025 21:38:24 GMT (envelope-from git) Date: Thu, 30 Jan 2025 21:38:24 GMT Message-Id: <202501302138.50ULcOpi062812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4a1b0a9e2b9f - main - unifdef: Restore damaged test case. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4a1b0a9e2b9f717e14df082735d3a85cf158b1af Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4a1b0a9e2b9f717e14df082735d3a85cf158b1af commit 4a1b0a9e2b9f717e14df082735d3a85cf158b1af Author: Dag-Erling Smørgrav AuthorDate: 2025-01-30 21:32:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-01-30 21:38:07 +0000 unifdef: Restore damaged test case. The input for the hash_comment test case was damaged in a cleanup sweep. Restore the original input and tweak it slightly so it no longer matches the regex used in said sweep. Sponsored by: Klara, Inc. Fixes: 5e3934b15a2741b2de6b217e77dc9d798d740804 --- usr.bin/unifdef/tests/unifdef_test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index 5a022a5384e7..7af782e8c9e2 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -10,7 +10,9 @@ hash_comment_head() { } hash_comment_body() { cat >f <