git: 0d3a87569f14 - main - file_test: Fix file test

The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/src/commit/?id=0d3a87569f14b0e48826bbaab5e05f35669bcebf

commit 0d3a87569f14b0e48826bbaab5e05f35669bcebf
Author:     Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2023-10-07 12:47:29 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-10-09 04:44:14 +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
---
 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
 }