From nobody Sun Dec 22 07:40:27 2024 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 4YGCk40JCdz5jCrb; Sun, 22 Dec 2024 07:40:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGCk350Xpz4cb5; Sun, 22 Dec 2024 07:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734853227; 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=Onvj/XN0QDp3467tq2hMeurZPLOLC7MtQ7J6uuM3HTs=; b=VyJCCUpZ1uPQeYDSHgFpuEzmfhr3XAquUIXWb7H8LU/NPObwTNU8K32hgeY7eUSe4krskz udW+G9EFVRTcvY0NRB7V8DWoRTnN5wpmJuaMcb3Fjr2Dx15B5VhC5tmdt3fG7EfM1G/XCv 5mu/k9rpz0YG4uFjfmgeG3OtaeMvnUDX++7valakpVgNkjiOvj9RWUJIWgEDdgOZpssv9h m7iypgfLQSr6wi2ggz6PwHnJryjhKHNxzA90DnH+REXbCp+9/nz7e34tpykyrlXZyEx9Xf 77tkoNEoXEgaoRafMBTcH212N5KKKH51CMJpTlEKYdiSCfD8puu7GG2cKuDrnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734853227; 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=Onvj/XN0QDp3467tq2hMeurZPLOLC7MtQ7J6uuM3HTs=; b=LTY+2ZPGv/uPugU09tXLeU4dRYtUU8GLCMMDK4x9v1akkawUXelaLNbKb14Hq5grQCGUSn JjDOVoFbHpb6clg1GmXcBhmavFGgZcSi3M6pMZJt2Qwb6Ut4Bi+Oa0Zw3r9h9AZjr41Ood Zf7+EnhdLYu0W1QXIiYTPCss76DMU9rTd+Nj4lUnBf/LiNeLFoSLB4/XyR+wWVszk7KE7N m2c4oII8h8W25G7NK+9ePPNH2Zv7ASzAiRvxxClNTQVqaNqDdTLGzG9VjANZBrXB4cfu1m XQjtRsewEUlgbHy3W9oZy/OPqdNsWH7Iojf4OmcRwlplXzkV/yBV6E2tJbqZpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734853227; a=rsa-sha256; cv=none; b=A4RPU799lt4gt0Z1L7j8soWwRlCG4NIAWFt4Y18H39ZPrX/Jzm8HpiUV52fTCPUeJU/8yf vqvX0fiClfaHWSiqduza7/VoFQnu1jLUqdCvyNK9X5O/UY/0vpnY2NYuV4xLwI+EDKqlV/ efA+A0/r1szQFX7S/pclPm5UdIdAwhsOccm4t+htnh7ak47nS3eMAxbXyaIL6DyWlKnAOY eFyeaASc/siX/PAuvDchJ0qwMkB9WF6ClTsL2EhbxqQf2su8KPVFMUTgjM62hQUk6ASjpc KX/Pn18OwsqwGHxq8m2UNle5PjuKIrSVvm0Dwht2J+ngNxD2pFSsAdig8XPD/Q== 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 4YGCk34c20z108L; Sun, 22 Dec 2024 07:40:27 +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 4BM7eR0o012644; Sun, 22 Dec 2024 07:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BM7eRH3012641; Sun, 22 Dec 2024 07:40:27 GMT (envelope-from git) Date: Sun, 22 Dec 2024 07:40:27 GMT Message-Id: <202412220740.4BM7eRH3012641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 2d54b1f5e5a8 - stable/13 - file_test: Fix file test 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d54b1f5e5a8a29399e8fd131ef83fd0f4b8220d Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=2d54b1f5e5a8a29399e8fd131ef83fd0f4b8220d commit 2d54b1f5e5a8a29399e8fd131ef83fd0f4b8220d Author: Jose Luis Duran AuthorDate: 2023-10-07 12:47:29 +0000 Commit: Xin LI CommitDate: 2024-12-22 07:39:59 +0000 file_test: Fix file test Trimming of the line feed is no longer necessary after https://github.com/file/file/commit/d993c6b0db20711b2c4cb9d2bee8c7f2e59b0a43 Currently the tests: - bcachefs2 - gpkg-1-zst - multiple are failing, but a fix will be committed upstream. This also reverts c5e957ad4 "file: fix test case for gpkg by removing the extra \n." MFC after: 3 days (cherry picked from commit 0d3a87569f14b0e48826bbaab5e05f35669bcebf) --- contrib/file/tests/gpkg-1-zst.result | 2 +- usr.bin/file/tests/file_test.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/file/tests/gpkg-1-zst.result b/contrib/file/tests/gpkg-1-zst.result index 10379834d4b1..e99149450b1a 100644 --- a/contrib/file/tests/gpkg-1-zst.result +++ b/contrib/file/tests/gpkg-1-zst.result @@ -1 +1 @@ -Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression \ No newline at end of file +Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh index e6e398f6e51d..02d494b0f643 100644 --- a/usr.bin/file/tests/file_test.sh +++ b/usr.bin/file/tests/file_test.sh @@ -40,8 +40,7 @@ contrib_file_tests_body() { # The result files were created in UTC. TZ=Z atf_check -o save:actual_output file ${file_args} \ --brief "$testfile" - atf_check -o save:trimmed_output tr -d '\012' < actual_output - atf_check cmp trimmed_output "$result_file" + atf_check cmp actual_output "$result_file" done }