upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 06:15:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

file_test: Fix file test

Browse source 
Trimming of the line feed is no longer necessary after
d993c6b0db

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 0d3a87569f)
This commit is contained in:
Jose Luis Duran 2023-10-07 12:47:29 +00:00 committed by Ed Maste
parent f790f28092
commit c3ca5da36e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/file/tests/gpkg-1-zst.result
View file

@ -1 +1 @@
Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression
Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression

3
usr.bin/file/tests/file_test.sh
View file

@ -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
}