diff options
| author | Xin LI <delphij@FreeBSD.org> | 2026-06-03 04:54:25 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2026-06-20 03:25:44 +0000 |
| commit | d58218761eeb4e7a2a375b7d2ed80c31a311f3fd (patch) | |
| tree | 107967fea1ecdce372f0bbdd89d8d47d1b375ec5 /contrib/file/tests | |
| parent | 94d7f7e47cde29d3dec533d171713505170b4b25 (diff) | |
MFV: file 5.47.
(cherry picked from commit e949ce9dc0e6fff26e83904f1008b76d36ba0a37)
file: normalize .result files to ensure trailing newline on install
Some upstream result files introduced in file 5.47 (e.g., bgcode.result)
lack a trailing newline, causing the contrib_file_tests ATF test to
fail with "cmp: EOF on bgcode.result". Generate normalized copies
of the expected results and install those instead.
Fixes: e949ce9dc0e6fff26e83904f1008b76d36ba0a37
(cherry picked from commit f7c0bd206fe4f3a956b3ecb4dc11a7386b85fa22)
Diffstat (limited to 'contrib/file/tests')
| -rw-r--r-- | contrib/file/tests/Makefile.am | 27 | ||||
| -rw-r--r-- | contrib/file/tests/Makefile.in | 27 | ||||
| -rw-r--r-- | contrib/file/tests/arj.result | 2 | ||||
| -rw-r--r-- | contrib/file/tests/bgcode.result | 1 | ||||
| -rw-r--r-- | contrib/file/tests/bgcode.testfile | bin | 0 -> 1430943 bytes | |||
| -rw-r--r-- | contrib/file/tests/efi-signature-list-sha256.result | 1 | ||||
| -rwxr-xr-x | contrib/file/tests/efi-signature-list-sha256.testfile | bin | 0 -> 76 bytes |
7 files changed, 55 insertions, 3 deletions
diff --git a/contrib/file/tests/Makefile.am b/contrib/file/tests/Makefile.am index 6e45949af223..32b35c1c1d64 100644 --- a/contrib/file/tests/Makefile.am +++ b/contrib/file/tests/Makefile.am @@ -13,6 +13,31 @@ bcachefs.result \ bcachefs.testfile \ bcachefs2.result \ bcachefs2.testfile \ +bgcode.result \ +bgcode.testfile \ +cl8m8ocofedso.result \ +cl8m8ocofedso.testfile \ +cmd1.result \ +cmd1.testfile \ +cmd2.result \ +cmd2.testfile \ +cmd3.result \ +cmd3.testfile \ +cmd4.result \ +cmd4.testfile \ +CVE-2014-1943.result \ +CVE-2014-1943.testfile \ +dsd64-dff.result \ +dsd64-dff.testfile \ +dsd64-dsf.result \ +dsd64-dsf.testfile \ +efi-signature-list-sha256.result \ +efi-signature-list-sha256.testfile \ +escapevel.result \ +escapevel.testfile \ +ext4.result \ +ext4.testfile \ +fit-map-data.result \ cl8m8ocofedso.result \ cl8m8ocofedso.testfile \ cmd1.result \ @@ -193,7 +218,7 @@ check-local: if [ -z "$$m" ]; then \ m=$$j; \ else \ - m=$$m:$$j; \ + m=$$m${PATH_SEPARATOR}$$j; \ fi \ fi \ done; \ diff --git a/contrib/file/tests/Makefile.in b/contrib/file/tests/Makefile.in index 4f583bf540a7..4c5ead125c2b 100644 --- a/contrib/file/tests/Makefile.in +++ b/contrib/file/tests/Makefile.in @@ -307,6 +307,31 @@ bcachefs.result \ bcachefs.testfile \ bcachefs2.result \ bcachefs2.testfile \ +bgcode.result \ +bgcode.testfile \ +cl8m8ocofedso.result \ +cl8m8ocofedso.testfile \ +cmd1.result \ +cmd1.testfile \ +cmd2.result \ +cmd2.testfile \ +cmd3.result \ +cmd3.testfile \ +cmd4.result \ +cmd4.testfile \ +CVE-2014-1943.result \ +CVE-2014-1943.testfile \ +dsd64-dff.result \ +dsd64-dff.testfile \ +dsd64-dsf.result \ +dsd64-dsf.testfile \ +efi-signature-list-sha256.result \ +efi-signature-list-sha256.testfile \ +escapevel.result \ +escapevel.testfile \ +ext4.result \ +ext4.testfile \ +fit-map-data.result \ cl8m8ocofedso.result \ cl8m8ocofedso.testfile \ cmd1.result \ @@ -801,7 +826,7 @@ check-local: if [ -z "$$m" ]; then \ m=$$j; \ else \ - m=$$m:$$j; \ + m=$$m${PATH_SEPARATOR}$$j; \ fi \ fi \ done; \ diff --git a/contrib/file/tests/arj.result b/contrib/file/tests/arj.result index 7198be22bb3b..654694586f0b 100644 --- a/contrib/file/tests/arj.result +++ b/contrib/file/tests/arj.result @@ -1 +1 @@ -ARJ archive data, v11, slash-switched, created 5 1980+48, original name: example_m0.arj, os: Unix +ARJ archive data, v11, slash-switched, created Jan 05 2028 07:31:08, modified Jan 05 2028 07:31:08, original name: example_m0.arj, os: Unix diff --git a/contrib/file/tests/bgcode.result b/contrib/file/tests/bgcode.result new file mode 100644 index 000000000000..87bfa0037b9c --- /dev/null +++ b/contrib/file/tests/bgcode.result @@ -0,0 +1 @@ +Binary G-code Version 1, CRC32 checksum
\ No newline at end of file diff --git a/contrib/file/tests/bgcode.testfile b/contrib/file/tests/bgcode.testfile Binary files differnew file mode 100644 index 000000000000..bc2a37f75499 --- /dev/null +++ b/contrib/file/tests/bgcode.testfile diff --git a/contrib/file/tests/efi-signature-list-sha256.result b/contrib/file/tests/efi-signature-list-sha256.result new file mode 100644 index 000000000000..04c597e372f5 --- /dev/null +++ b/contrib/file/tests/efi-signature-list-sha256.result @@ -0,0 +1 @@ +EFI Signature List, SHA256, total size: 76 bytes
\ No newline at end of file diff --git a/contrib/file/tests/efi-signature-list-sha256.testfile b/contrib/file/tests/efi-signature-list-sha256.testfile Binary files differnew file mode 100755 index 000000000000..9faf68ee8af0 --- /dev/null +++ b/contrib/file/tests/efi-signature-list-sha256.testfile |