vendor/file/5.45

102 files changed, 268 insertions, 109 deletions

diff --git a/tests/CVE-2014-1943.result b/tests/CVE-2014-1943.result
index 68b50898b341..1b31457a1001 100644
--- a/tests/CVE-2014-1943.result
+++ b/tests/CVE-2014-1943.result
@@ -1 +1 @@
-Apple Driver Map, blocksize 0
\ No newline at end of file
+Apple Driver Map, blocksize 0
diff --git a/tests/HWP2016.hwp.result b/tests/HWP2016.hwp.result
new file mode 100644
index 000000000000..2edd0b53aca7
--- /dev/null
+++ b/tests/HWP2016.hwp.result
@@ -0,0 +1 @@
+Hancom HWP (Hangul Word Processor) file, version 5.0
diff --git a/tests/HWP2016.hwp.testfile b/tests/HWP2016.hwp.testfile
new file mode 100644
index 000000000000..75ab61d2103b
--- /dev/null
+++ b/tests/HWP2016.hwp.testfile
diff --git a/tests/HWP2016.hwpx.zip.result b/tests/HWP2016.hwpx.zip.result
new file mode 100644
index 000000000000..6077a602a5cf
--- /dev/null
+++ b/tests/HWP2016.hwpx.zip.result
@@ -0,0 +1 @@
+Hancom HWP (Hangul Word Processor) file, HWPX
diff --git a/tests/HWP2016.hwpx.zip.testfile b/tests/HWP2016.hwpx.zip.testfile
new file mode 100644
index 000000000000..7f1706369900
--- /dev/null
+++ b/tests/HWP2016.hwpx.zip.testfile
diff --git a/tests/HWP97.hwp.result b/tests/HWP97.hwp.result
new file mode 100644
index 000000000000..d77b46e2935f
--- /dev/null
+++ b/tests/HWP97.hwp.result
@@ -0,0 +1 @@
+Hancom HWP (Hangul Word Processor) file, version 3.0
diff --git a/tests/HWP97.hwp.testfile b/tests/HWP97.hwp.testfile
new file mode 100644
index 000000000000..eeabcce5e090
--- /dev/null
+++ b/tests/HWP97.hwp.testfile
diff --git a/tests/JW07022A.mp3.result b/tests/JW07022A.mp3.result
index f5911910ddb6..fe4dd3648d27 100644
--- a/tests/JW07022A.mp3.result
+++ b/tests/JW07022A.mp3.result
@@ -1 +1 @@
-Audio file with ID3 version 2.2.0, contains: MPEG ADTS, layer III, v1, 96 kbps, 44.1 kHz, Monaural
\ No newline at end of file
+Audio file with ID3 version 2.2.0, contains: MPEG ADTS, layer III, v1, 96 kbps, 44.1 kHz, Monaural
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c581258a761a..36b4ff206c2a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,14 +9,22 @@ android-vdex-2.result \
 android-vdex-2.testfile \
 arj.result \
 arj.testfile \
-CVE-2014-1943.result \
-CVE-2014-1943.testfile \
-JW07022A.mp3.result \
-JW07022A.mp3.testfile \
 bcachefs.result \
 bcachefs.testfile \
+bcachefs2.result \
+bcachefs2.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 \
@@ -31,12 +39,22 @@ gedcom.result \
 gedcom.testfile \
 gpkg-1-zst.result \
 gpkg-1-zst.testfile \
+hello-racket_rkt.result \
+hello-racket_rkt.testfile \
 hddrawcopytool.result \
 hddrawcopytool.testfile \
+HWP2016.hwp.result \
+HWP2016.hwp.testfile \
+HWP2016.hwpx.zip.result \
+HWP2016.hwpx.zip.testfile \
+HWP97.hwp.result \
+HWP97.hwp.testfile \
 issue311docx.result \
 issue311docx.testfile \
 issue359xlsx.result \
 issue359xlsx.testfile \
+jpeg-text.result \
+jpeg-text.testfile \
 json1.result \
 json1.testfile \
 json2.result \
@@ -53,10 +71,17 @@ json7.result \
 json7.testfile \
 json8.result \
 json8.testfile \
-jsonlines1.testfile \
 jsonlines1.result \
+jsonlines1.testfile \
+JW07022A.mp3.result \
+JW07022A.mp3.testfile \
 matilde.arm.result \
 matilde.arm.testfile \
+multiple-A.magic \
+multiple-B.magic \
+multiple.flags \
+multiple.result \
+multiple.testfile \
 pcjr.result \
 pcjr.testfile \
 pgp-binary-key-v2-phil.result \
@@ -75,11 +100,21 @@ pgp-binary-key-v4-rsa-no-userid-secret.result \
 pgp-binary-key-v4-rsa-no-userid-secret.testfile \
 pgp-binary-key-v4-rsa-secret-key.result \
 pgp-binary-key-v4-rsa-secret-key.testfile \
+pnm1.result \
+pnm1.testfile \
+pnm2.result \
+pnm2.testfile \
+pnm3.result \
+pnm3.testfile \
 regex-eol.magic \
 regex-eol.result \
 regex-eol.testfile \
+registry-pol.result \
+registry-pol.testfile \
 uf2.result \
 uf2.testfile \
+xclbin.result \
+xclbin.testfile \
 zstd-3-skippable-frames.result \
 zstd-dictionary-0.result \
 zstd-dictionary-1.result \
@@ -127,14 +162,27 @@ zstd-v0.8-FF.testfile
 
 T = $(top_srcdir)/tests
 check-local:
-	MAGIC=$(top_builddir)/magic/magic ./test
 	set -e; \
 	for i in $T/*.testfile; do \
-		echo Running test: $$i; \
-		if [ -f $${i%%.testfile}.magic ]; then \
-			m=$${i%%.testfile}.magic; \
-		else \
+		t=$${i%%.testfile}; \
+		echo Running test: $$t; \
+		m=; \
+		for j in $$(eval echo $${t}\*.magic); do \
+			if [ -f "$$j" ]; then \
+				if [ -z "$$m" ]; then \
+					m=$$j; \
+				else \
+					m=$$m:$$j; \
+				fi \
+			fi \
+		done; \
+		if [ -z "$$m" ]; then \
 			m=$(top_builddir)/magic/magic; \
 		fi; \
-		TZ=UTC MAGIC=$$m ./test $$i $${i%%.testfile}.result; \
+		f=-e; \
+		if [ -f $${t}.flags ]; then \
+			f=$$f$$(cat $${t}.flags); \
+		fi; \
+		echo TZ=UTC MAGIC=$$m ./test $$f $$i $${t}.result; \
+		TZ=UTC MAGIC=$$m ./test $$f $$i $${t}.result; \
 	done
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d08096b0b7c0..28033eeaa0a1 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -302,14 +302,22 @@ android-vdex-2.result \
 android-vdex-2.testfile \
 arj.result \
 arj.testfile \
-CVE-2014-1943.result \
-CVE-2014-1943.testfile \
-JW07022A.mp3.result \
-JW07022A.mp3.testfile \
 bcachefs.result \
 bcachefs.testfile \
+bcachefs2.result \
+bcachefs2.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 \
@@ -324,12 +332,22 @@ gedcom.result \
 gedcom.testfile \
 gpkg-1-zst.result \
 gpkg-1-zst.testfile \
+hello-racket_rkt.result \
+hello-racket_rkt.testfile \
 hddrawcopytool.result \
 hddrawcopytool.testfile \
+HWP2016.hwp.result \
+HWP2016.hwp.testfile \
+HWP2016.hwpx.zip.result \
+HWP2016.hwpx.zip.testfile \
+HWP97.hwp.result \
+HWP97.hwp.testfile \
 issue311docx.result \
 issue311docx.testfile \
 issue359xlsx.result \
 issue359xlsx.testfile \
+jpeg-text.result \
+jpeg-text.testfile \
 json1.result \
 json1.testfile \
 json2.result \
@@ -346,10 +364,17 @@ json7.result \
 json7.testfile \
 json8.result \
 json8.testfile \
-jsonlines1.testfile \
 jsonlines1.result \
+jsonlines1.testfile \
+JW07022A.mp3.result \
+JW07022A.mp3.testfile \
 matilde.arm.result \
 matilde.arm.testfile \
+multiple-A.magic \
+multiple-B.magic \
+multiple.flags \
+multiple.result \
+multiple.testfile \
 pcjr.result \
 pcjr.testfile \
 pgp-binary-key-v2-phil.result \
@@ -368,11 +393,21 @@ pgp-binary-key-v4-rsa-no-userid-secret.result \
 pgp-binary-key-v4-rsa-no-userid-secret.testfile \
 pgp-binary-key-v4-rsa-secret-key.result \
 pgp-binary-key-v4-rsa-secret-key.testfile \
+pnm1.result \
+pnm1.testfile \
+pnm2.result \
+pnm2.testfile \
+pnm3.result \
+pnm3.testfile \
 regex-eol.magic \
 regex-eol.result \
 regex-eol.testfile \
+registry-pol.result \
+registry-pol.testfile \
 uf2.result \
 uf2.testfile \
+xclbin.result \
+xclbin.testfile \
 zstd-3-skippable-frames.result \
 zstd-dictionary-0.result \
 zstd-dictionary-1.result \
@@ -734,16 +769,29 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 check-local:
-	MAGIC=$(top_builddir)/magic/magic ./test
 	set -e; \
 	for i in $T/*.testfile; do \
-		echo Running test: $$i; \
-		if [ -f $${i%%.testfile}.magic ]; then \
-			m=$${i%%.testfile}.magic; \
-		else \
+		t=$${i%%.testfile}; \
+		echo Running test: $$t; \
+		m=; \
+		for j in $$(eval echo $${t}\*.magic); do \
+			if [ -f "$$j" ]; then \
+				if [ -z "$$m" ]; then \
+					m=$$j; \
+				else \
+					m=$$m:$$j; \
+				fi \
+			fi \
+		done; \
+		if [ -z "$$m" ]; then \
 			m=$(top_builddir)/magic/magic; \
 		fi; \
-		TZ=UTC MAGIC=$$m ./test $$i $${i%%.testfile}.result; \
+		f=-e; \
+		if [ -f $${t}.flags ]; then \
+			f=$$f$$(cat $${t}.flags); \
+		fi; \
+		echo TZ=UTC MAGIC=$$m ./test $$f $$i $${t}.result; \
+		TZ=UTC MAGIC=$$m ./test $$f $$i $${t}.result; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/android-vdex-1.result b/tests/android-vdex-1.result
index 2a4ef6d6b2cb..8ca56540bca5 100644
--- a/tests/android-vdex-1.result
+++ b/tests/android-vdex-1.result
@@ -1 +1 @@
-Android vdex file, verifier deps version: 021, dex section version: 002, number of dex files: 4, verifier deps size: 106328
\ No newline at end of file
+Android vdex file, verifier deps version: 021, dex section version: 002, number of dex files: 4, verifier deps size: 106328
diff --git a/tests/android-vdex-2.result b/tests/android-vdex-2.result
index 498ae97c7b18..6fb023603458 100644
--- a/tests/android-vdex-2.result
+++ b/tests/android-vdex-2.result
@@ -1 +1 @@
-Android vdex file, being processed by dex2oat, verifier deps version: 019, dex section version: 002, number of dex files: 1, verifier deps size: 1016
\ No newline at end of file
+Android vdex file, being processed by dex2oat, verifier deps version: 019, dex section version: 002, number of dex files: 1, verifier deps size: 1016
diff --git a/tests/arj.result b/tests/arj.result
index 8a32e67eb1c0..7198be22bb3b 100644
--- a/tests/arj.result
+++ b/tests/arj.result
@@ -1 +1 @@
-ARJ archive data, v11, slash-switched, created 5 1980+48, original name: example_m0.arj, os: Unix
\ No newline at end of file
+ARJ archive data, v11, slash-switched, created 5 1980+48, original name: example_m0.arj, os: Unix
diff --git a/tests/bcachefs.result b/tests/bcachefs.result
index 6f31de2ae9d5..83d37eadf990 100644
--- a/tests/bcachefs.result
+++ b/tests/bcachefs.result
@@ -1 +1 @@
-bcachefs, UUID=46bd306f-80ad-4cd0-af4f-147e7d85f393, label "Label", version 13, min version 13, device 0/UUID=72a60ede-4cb6-4374-aa70-cb38a50af5ef, 1 devices
\ No newline at end of file
+bcachefs, UUID=46bd306f-80ad-4cd0-af4f-147e7d85f393, label "Label", version 13, min version 13, device 0/UUID=72a60ede-4cb6-4374-aa70-cb38a50af5ef, 1 devices
diff --git a/tests/bcachefs2.result b/tests/bcachefs2.result
new file mode 100644
index 000000000000..9ebf64bb55bc
--- /dev/null
+++ b/tests/bcachefs2.result
@@ -0,0 +1 @@
+bcachefs, UUID=4fa11b1e-75e6-4210-9167-34e1769c0fe1, label "Label", version 26, min version 26, device 0/UUID=0a3643b7-c515-47f8-a0ea-91fc38d043d1, 1 devices (unclean)
\ No newline at end of file
diff --git a/tests/bcachefs2.testfile b/tests/bcachefs2.testfile
new file mode 100644
index 000000000000..3391822a79a4
--- /dev/null
+++ b/tests/bcachefs2.testfile
diff --git a/tests/cl8m8ocofedso.result b/tests/cl8m8ocofedso.result
index 323c31a8e231..e1dd3b1673cd 100644
--- a/tests/cl8m8ocofedso.result
+++ b/tests/cl8m8ocofedso.result
@@ -1 +1 @@
-Audio file with ID3 version 2.4.0, contains: MPEG ADTS, layer III, v1, 192 kbps, 44.1 kHz, JntStereo
\ No newline at end of file
+Audio file with ID3 version 2.4.0, contains: MPEG ADTS, layer III, v1, 192 kbps, 44.1 kHz, JntStereo
diff --git a/tests/cmd1.result b/tests/cmd1.result
new file mode 100644
index 000000000000..d77043f6046c
--- /dev/null
+++ b/tests/cmd1.result
@@ -0,0 +1 @@
+a /usr/bin/cmd1 script, ASCII text executable
diff --git a/tests/cmd1.testfile b/tests/cmd1.testfile
new file mode 100644
index 000000000000..8277edf20418
--- /dev/null
+++ b/tests/cmd1.testfile
@@ -0,0 +1 @@
+#! /usr/bin/cmd1
diff --git a/tests/cmd2.result b/tests/cmd2.result
new file mode 100644
index 000000000000..77627c3607e9
--- /dev/null
+++ b/tests/cmd2.result
@@ -0,0 +1 @@
+a /usr/bin/cmd2 script, ASCII text executable
diff --git a/tests/cmd2.testfile b/tests/cmd2.testfile
new file mode 100644
index 000000000000..104a0170d847
--- /dev/null
+++ b/tests/cmd2.testfile
@@ -0,0 +1 @@
+#!/usr/bin/cmd2
diff --git a/tests/cmd3.result b/tests/cmd3.result
new file mode 100644
index 000000000000..2d100e007008
--- /dev/null
+++ b/tests/cmd3.result
@@ -0,0 +1 @@
+a /usr/bin/cmd3 script executable (binary data)
diff --git a/tests/cmd3.testfile b/tests/cmd3.testfile
new file mode 100644
index 000000000000..8287acab425d
--- /dev/null
+++ b/tests/cmd3.testfile
@@ -0,0 +1,2 @@
+#!/usr/bin/cmd3
+

diff --git a/tests/cmd4.result b/tests/cmd4.result
new file mode 100644
index 000000000000..af635a43ae80
--- /dev/null
+++ b/tests/cmd4.result
@@ -0,0 +1 @@
+a /usr/bin/cmd4 script executable (binary data)
diff --git a/tests/cmd4.testfile b/tests/cmd4.testfile
new file mode 100644
index 000000000000..529053ee86de
--- /dev/null
+++ b/tests/cmd4.testfile
@@ -0,0 +1,2 @@
+#!	/usr/bin/cmd4
+

diff --git a/tests/dsd64-dff.result b/tests/dsd64-dff.result
index 0c8d823ed5e0..bf6096785c25 100644
--- a/tests/dsd64-dff.result
+++ b/tests/dsd64-dff.result
@@ -1 +1 @@
-DSDIFF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.0.0
\ No newline at end of file
+DSDIFF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.0.0
diff --git a/tests/dsd64-dsf.result b/tests/dsd64-dsf.result
index cf67839c96fa..a0d5f759afee 100644
--- a/tests/dsd64-dsf.result
+++ b/tests/dsd64-dsf.result
@@ -1 +1 @@
-DSF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.3.0
\ No newline at end of file
+DSF audio bitstream data, 1 bit, mono, "DSD 64" 2822400 Hz, no compression, ID3 version 2.3.0
diff --git a/tests/escapevel.result b/tests/escapevel.result
index c0a265c77afb..163f9917a300 100644
--- a/tests/escapevel.result
+++ b/tests/escapevel.result
@@ -1 +1 @@
-Zip data (MIME type "application/vnd.nz.gen.geek_central.ti5x"?)
\ No newline at end of file
+Zip data (MIME type "application/vnd.nz.gen.geek_central.ti5x"?)
diff --git a/tests/ext4.result b/tests/ext4.result
index e48ac193380c..4e9657c17a28 100644
--- a/tests/ext4.result
+++ b/tests/ext4.result
@@ -1 +1 @@
-Linux rev 1.0 ext4 filesystem data, UUID=d32bbb08-3a76-4510-a064-3045f887dbdf (extents) (64bit) (large files) (huge files)
\ No newline at end of file
+Linux rev 1.0 ext4 filesystem data, UUID=d32bbb08-3a76-4510-a064-3045f887dbdf (extents) (64bit) (large files) (huge files)
diff --git a/tests/fit-map-data.result b/tests/fit-map-data.result
index 0dbbb1b5e356..5d97617d5576 100644
--- a/tests/fit-map-data.result
+++ b/tests/fit-map-data.result
@@ -1 +1 @@
-FIT Map data, unit id 65536, serial 3879446968, Sat May 31 10:00:34 2014, manufacturer 1 (garmin), product 1632, type 4 (Activity)
\ No newline at end of file
+FIT Map data, unit id 65536, serial 3879446968, Sat May 31 10:00:34 2014, manufacturer 1 (garmin), product 1632, type 4 (Activity)
diff --git a/tests/gedcom.result b/tests/gedcom.result
index 1fd81618d8fb..bcd1176b5789 100644
--- a/tests/gedcom.result
+++ b/tests/gedcom.result
@@ -1 +1 @@
-GEDCOM genealogy text version 5.5, ASCII text
\ No newline at end of file
+GEDCOM genealogy text version 5.5, ASCII text
diff --git a/tests/hddrawcopytool.result b/tests/hddrawcopytool.result
index 0fe077dca388..53d8ad008706 100644
--- a/tests/hddrawcopytool.result
+++ b/tests/hddrawcopytool.result
@@ -1 +1 @@
-HDD Raw Copy Tool 1.10 - HD model: ST500DM0 02-1BD142 serial: 51D20233A7C0
\ No newline at end of file
+HDD Raw Copy Tool 1.10 - HD model: ST500DM0 02-1BD142 serial: 51D20233A7C0
diff --git a/tests/hello-racket_rkt.result b/tests/hello-racket_rkt.result
new file mode 100644
index 000000000000..ca2000968f42
--- /dev/null
+++ b/tests/hello-racket_rkt.result
@@ -0,0 +1 @@
+Racket bytecode (version 8.5)
diff --git a/tests/hello-racket_rkt.testfile b/tests/hello-racket_rkt.testfile
new file mode 100644
index 000000000000..22e944001066
--- /dev/null
+++ b/tests/hello-racket_rkt.testfile
diff --git a/tests/issue311docx.result b/tests/issue311docx.result
index 646ee85609fd..816a4bc75360 100644
--- a/tests/issue311docx.result
+++ b/tests/issue311docx.result
@@ -1 +1 @@
-Microsoft Word 2007+
\ No newline at end of file
+Microsoft Word 2007+
diff --git a/tests/issue359xlsx.result b/tests/issue359xlsx.result
index d1e15b440767..650769669a18 100644
--- a/tests/issue359xlsx.result
+++ b/tests/issue359xlsx.result
@@ -1 +1 @@
-Microsoft Excel 2007+
\ No newline at end of file
+Microsoft Excel 2007+
diff --git a/tests/jpeg-text.result b/tests/jpeg-text.result
new file mode 100644
index 000000000000..c35c5b716e7f
--- /dev/null
+++ b/tests/jpeg-text.result
@@ -0,0 +1 @@
+ASCII text, with no line terminators
diff --git a/tests/jpeg-text.testfile b/tests/jpeg-text.testfile
new file mode 100644
index 000000000000..fe119bdce020
--- /dev/null
+++ b/tests/jpeg-text.testfile
@@ -0,0 +1 @@
+/*! jP
\ No newline at end of file
diff --git a/tests/json1.result b/tests/json1.result
index 550d7ac2f9db..7d635242fa84 100644
--- a/tests/json1.result
+++ b/tests/json1.result
@@ -1 +1 @@
-JSON text data
\ No newline at end of file
+JSON text data
diff --git a/tests/json2.result b/tests/json2.result
index 550d7ac2f9db..7d635242fa84 100644
--- a/tests/json2.result
+++ b/tests/json2.result
@@ -1 +1 @@
-JSON text data
\ No newline at end of file
+JSON text data
diff --git a/tests/json3.result b/tests/json3.result
index 550d7ac2f9db..7d635242fa84 100644
--- a/tests/json3.result
+++ b/tests/json3.result
@@ -1 +1 @@
-JSON text data
\ No newline at end of file
+JSON text data
diff --git a/tests/json4.result b/tests/json4.result
index 550d7ac2f9db..7d635242fa84 100644
--- a/tests/json4.result
+++ b/tests/json4.result
@@ -1 +1 @@
-JSON text data
\ No newline at end of file
+JSON text data
diff --git a/tests/json5.result b/tests/json5.result
index 90965495a30f..6f505ff47714 100644
--- a/tests/json5.result
+++ b/tests/json5.result
@@ -1 +1 @@
-ASCII text
\ No newline at end of file
+ASCII text
diff --git a/tests/json6.result b/tests/json6.result
index 550d7ac2f9db..7d635242fa84 100644
--- a/tests/json6.result
+++ b/tests/json6.result
@@ -1 +1 @@
-JSON text data
\ No newline at end of file
+JSON text data
diff --git a/tests/json7.result b/tests/json7.result
index 90965495a30f..6f505ff47714 100644
--- a/tests/json7.result
+++ b/tests/json7.result
@@ -1 +1 @@
-ASCII text
\ No newline at end of file
+ASCII text
diff --git a/tests/json8.result b/tests/json8.result
index 550d7ac2f9db..7d635242fa84 100644
--- a/tests/json8.result
+++ b/tests/json8.result
@@ -1 +1 @@
-JSON text data
\ No newline at end of file
+JSON text data
diff --git a/tests/jsonlines1.result b/tests/jsonlines1.result
index 4615201f8fc4..7eb1ba066aa0 100644
--- a/tests/jsonlines1.result
+++ b/tests/jsonlines1.result
@@ -1 +1 @@
-New Line Delimited JSON text data
\ No newline at end of file
+New Line Delimited JSON text data
diff --git a/tests/matilde.arm.result b/tests/matilde.arm.result
index 4d9190d9d319..66aeaad677e7 100644
--- a/tests/matilde.arm.result
+++ b/tests/matilde.arm.result
@@ -1 +1 @@
-Adaptive Multi-Rate Codec (GSM telephony)
\ No newline at end of file
+Adaptive Multi-Rate Codec (GSM telephony)
diff --git a/tests/multiple-A.magic b/tests/multiple-A.magic
new file mode 100644
index 000000000000..7709bb2c6bf7
--- /dev/null
+++ b/tests/multiple-A.magic
@@ -0,0 +1,2 @@
+0 search {\\rt1 RTF1.0
+16 search ViVa2 Viva File 2.0
diff --git a/tests/multiple-B.magic b/tests/multiple-B.magic
new file mode 100644
index 000000000000..ccc452d7ab34
--- /dev/null
+++ b/tests/multiple-B.magic
@@ -0,0 +1,2 @@
+6 search ABCD ABCD File
+10 search TesT Test File 1.0
diff --git a/tests/multiple.flags b/tests/multiple.flags
new file mode 100644
index 000000000000..b68fde2a051d
--- /dev/null
+++ b/tests/multiple.flags
@@ -0,0 +1 @@
+k
diff --git a/tests/multiple.result b/tests/multiple.result
new file mode 100644
index 000000000000..8a8c5dfad20f
--- /dev/null
+++ b/tests/multiple.result
@@ -0,0 +1 @@
+RTF1.0\012- Viva File 2.0\012- ABCD File\012- Test File 1.0, ASCII text, with no line terminators
diff --git a/tests/multiple.testfile b/tests/multiple.testfile
new file mode 100644
index 000000000000..388979a6a744
--- /dev/null
+++ b/tests/multiple.testfile
@@ -0,0 +1 @@
+{\rt1 ABCDTesT xxViVa2
\ No newline at end of file
diff --git a/tests/pcjr.result b/tests/pcjr.result
index 955c8c7750af..92fcccb6331c 100644
--- a/tests/pcjr.result
+++ b/tests/pcjr.result
@@ -1 +1 @@
-PCjr Cartridge image
\ No newline at end of file
+PCjr Cartridge image
diff --git a/tests/pgp-binary-key-v2-phil.result b/tests/pgp-binary-key-v2-phil.result
index 9a0c0959b69d..ed50111c733d 100644
--- a/tests/pgp-binary-key-v2-phil.result
+++ b/tests/pgp-binary-key-v2-phil.result
@@ -1 +1 @@
-OpenPGP Public Key Version 2, Created Fri May 21 05:20:00 1993, RSA (Encrypt or Sign, 1024 bits); User ID; Signature; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Public Key Version 2, Created Fri May 21 05:20:00 1993, RSA (Encrypt or Sign, 1024 bits); User ID; Signature; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v3-lutz.result b/tests/pgp-binary-key-v3-lutz.result
index 5a8dba9622af..2bebc0be71cd 100644
--- a/tests/pgp-binary-key-v3-lutz.result
+++ b/tests/pgp-binary-key-v3-lutz.result
@@ -1 +1 @@
-OpenPGP Public Key Version 3, Created Mon Mar 17 11:14:30 1997, RSA (Encrypt or Sign, 1127 bits); User ID; Signature; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Public Key Version 3, Created Mon Mar 17 11:14:30 1997, RSA (Encrypt or Sign, 1127 bits); User ID; Signature; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v4-dsa.result b/tests/pgp-binary-key-v4-dsa.result
index e309526e7eea..f3341ea51127 100644
--- a/tests/pgp-binary-key-v4-dsa.result
+++ b/tests/pgp-binary-key-v4-dsa.result
@@ -1 +1 @@
-OpenPGP Public Key Version 4, Created Mon Apr  7 22:23:01 1997, DSA (1024 bits); User ID; Signature; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Public Key Version 4, Created Mon Apr  7 22:23:01 1997, DSA (1024 bits); User ID; Signature; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v4-ecc-no-userid-secret.result b/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
index 9d075017f7ed..54f274b591b2 100644
--- a/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
+++ b/tests/pgp-binary-key-v4-ecc-no-userid-secret.result
@@ -1 +1 @@
-OpenPGP Secret Key Version 4, Created Wed Aug 26 20:52:13 2020, EdDSA; Signature; Secret Subkey; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Secret Key Version 4, Created Wed Aug 26 20:52:13 2020, EdDSA; Signature; Secret Subkey; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v4-ecc-secret-key.result b/tests/pgp-binary-key-v4-ecc-secret-key.result
index ff323a7a22b0..9fde23e9fed8 100644
--- a/tests/pgp-binary-key-v4-ecc-secret-key.result
+++ b/tests/pgp-binary-key-v4-ecc-secret-key.result
@@ -1 +1 @@
-OpenPGP Secret Key Version 4, Created Sat Aug 22 14:07:46 2020, EdDSA; User ID; Signature; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Secret Key Version 4, Created Sat Aug 22 14:07:46 2020, EdDSA; User ID; Signature; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v4-rsa-key.result b/tests/pgp-binary-key-v4-rsa-key.result
index c22310fb9dde..ab9b81df0345 100644
--- a/tests/pgp-binary-key-v4-rsa-key.result
+++ b/tests/pgp-binary-key-v4-rsa-key.result
@@ -1 +1 @@
-OpenPGP Secret Key Version 4, Created Sat Aug 22 14:05:57 2020, RSA (Encrypt or Sign, 3072 bits); User ID; Signature; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Secret Key Version 4, Created Sat Aug 22 14:05:57 2020, RSA (Encrypt or Sign, 3072 bits); User ID; Signature; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v4-rsa-no-userid-secret.result b/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
index c3c2ae22819f..8fcf1cff1103 100644
--- a/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
+++ b/tests/pgp-binary-key-v4-rsa-no-userid-secret.result
@@ -1 +1 @@
-OpenPGP Secret Key Version 4, Created Sat Aug 22 20:13:52 2020, RSA (Encrypt or Sign, 3072 bits); Signature; Secret Subkey; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Secret Key Version 4, Created Sat Aug 22 20:13:52 2020, RSA (Encrypt or Sign, 3072 bits); Signature; Secret Subkey; OpenPGP Certificate
diff --git a/tests/pgp-binary-key-v4-rsa-secret-key.result b/tests/pgp-binary-key-v4-rsa-secret-key.result
index c22310fb9dde..ab9b81df0345 100644
--- a/tests/pgp-binary-key-v4-rsa-secret-key.result
+++ b/tests/pgp-binary-key-v4-rsa-secret-key.result
@@ -1 +1 @@
-OpenPGP Secret Key Version 4, Created Sat Aug 22 14:05:57 2020, RSA (Encrypt or Sign, 3072 bits); User ID; Signature; OpenPGP Certificate
\ No newline at end of file
+OpenPGP Secret Key Version 4, Created Sat Aug 22 14:05:57 2020, RSA (Encrypt or Sign, 3072 bits); User ID; Signature; OpenPGP Certificate
diff --git a/tests/pnm1.result b/tests/pnm1.result
new file mode 100644
index 000000000000..15d9e82d3edd
--- /dev/null
+++ b/tests/pnm1.result
@@ -0,0 +1 @@
+Netpbm image data, size = 2 x 2, greymap, ASCII text
diff --git a/tests/pnm1.testfile b/tests/pnm1.testfile
new file mode 100644
index 000000000000..448108c5596d
--- /dev/null
+++ b/tests/pnm1.testfile
@@ -0,0 +1,5 @@
+P2
+2
+2
+255
+0 0 0 0
diff --git a/tests/pnm2.result b/tests/pnm2.result
new file mode 100644
index 000000000000..e1d9ec93eff0
--- /dev/null
+++ b/tests/pnm2.result
@@ -0,0 +1 @@
+Netpbm image data, size = 2 x 2, rawbits, greymap
diff --git a/tests/pnm2.testfile b/tests/pnm2.testfile
new file mode 100644
index 000000000000..baaeb2a1a14c
--- /dev/null
+++ b/tests/pnm2.testfile
diff --git a/tests/pnm3.result b/tests/pnm3.result
new file mode 100644
index 000000000000..49b800049583
--- /dev/null
+++ b/tests/pnm3.result
@@ -0,0 +1 @@
+Netpbm image data, size = 10 x 20, pixmap, ASCII text
diff --git a/tests/pnm3.testfile b/tests/pnm3.testfile
new file mode 100644
index 000000000000..e28b9ab8b80b
--- /dev/null
+++ b/tests/pnm3.testfile
@@ -0,0 +1,5 @@
+P3
+# CREATOR: GIMP PNM Filter Version 1.1
+10 20
+255
+255
diff --git a/tests/regex-eol.result b/tests/regex-eol.result
index 5b1a7dbb3f90..44d1eb7663d8 100644
--- a/tests/regex-eol.result
+++ b/tests/regex-eol.result
@@ -1 +1 @@
-Ansible Vault text, version 1.1, using AES256 encryption
\ No newline at end of file
+Ansible Vault text, version 1.1, using AES256 encryption
diff --git a/tests/registry-pol.result b/tests/registry-pol.result
new file mode 100644
index 000000000000..7ca512f0c402
--- /dev/null
+++ b/tests/registry-pol.result
@@ -0,0 +1 @@
+Group Policy Registry Policy, Version=1
diff --git a/tests/registry-pol.testfile b/tests/registry-pol.testfile
new file mode 100644
index 000000000000..643e4a6dffd7
--- /dev/null
+++ b/tests/registry-pol.testfile
diff --git a/tests/test.c b/tests/test.c
index 6c229bc05548..b3c2a85b226d 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -27,8 +27,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#include <time.h>
 
 #include "magic.h"
 
@@ -51,36 +53,41 @@ slurp(FILE *fp, size_t *final_len)
 {
 	size_t len = 256;
 	int c;
-	char *l = (char *)xrealloc(NULL, len), *s = l;
+	char *l = xrealloc(NULL, len), *s = l;
 
 	for (c = getc(fp); c != EOF; c = getc(fp)) {
 		if (s == l + len) {
-			l = xrealloc(l, len * 2);
+			s = l + len;
 			len *= 2;
+			l = xrealloc(l, len);
 		}
 		*s++ = c;
 	}
 	if (s != l && s[-1] == '\n')
 		s--;
-	if (s == l + len)
-		l = (char *)xrealloc(l, len + 1);
+	if (s == l + len) {
+		l = xrealloc(l, len + 1);
+		s = l + len;
+	}
 	*s++ = '\0';
 
 	*final_len = s - l;
-	l = (char *)xrealloc(l, s - l);
-	return l;
+	return xrealloc(l, s - l);
 }
 
 int
 main(int argc, char **argv)
 {
-	struct magic_set *ms;
+	struct magic_set *ms = NULL;
 	const char *result;
 	size_t result_len, desired_len;
 	char *desired = NULL;
-	int e = EXIT_FAILURE;
+	int e = EXIT_FAILURE, flags, c;
 	FILE *fp;
 
+	setenv("TZ", "UTC", 1);
+	tzset();
+
 
 	prog = strrchr(argv[0], '/');
 	if (prog)
@@ -88,7 +95,32 @@ main(int argc, char **argv)
 	else
 		prog = argv[0];
 
-	ms = magic_open(MAGIC_ERROR);
+	if (argc == 1)
+		return 0;
+
+	flags = 0;
+	while ((c = getopt(argc, argv, "ek")) != -1)
+		switch (c) {
+		case 'e':
+			flags |= MAGIC_ERROR;
+			break;
+		case 'k':
+			flags |= MAGIC_CONTINUE;
+			break;
+		default:
+			goto usage;
+		}
+
+	argc -= optind;
+	argv += optind;
+	if (argc != 2) {
+usage:
+		(void)fprintf(stderr,
+		    "Usage: %s [-ek] TEST-FILE RESULT\n", prog);
+		goto bad;
+	}
+
+	ms = magic_open(flags);
 	if (ms == NULL) {
 		(void)fprintf(stderr, "%s: ERROR opening MAGIC_NONE: %s\n",
 		    prog, strerror(errno));
@@ -100,29 +132,20 @@ main(int argc, char **argv)
 		goto bad;
 	}
 
-	if (argc == 1) {
-		e = 0;
-		goto bad;
-	}
-
-	if (argc != 3) {
-		(void)fprintf(stderr, "Usage: %s TEST-FILE RESULT\n", prog);
-		goto bad;
-	}
-	if ((result = magic_file(ms, argv[1])) == NULL) {
+	if ((result = magic_file(ms, argv[0])) == NULL) {
 		(void)fprintf(stderr, "%s: ERROR loading file %s: %s\n",
 		    prog, argv[1], magic_error(ms));
 		goto bad;
 	}
-	fp = fopen(argv[2], "r");
+	fp = fopen(argv[1], "r");
 	if (fp == NULL) {
 		(void)fprintf(stderr, "%s: ERROR opening `%s': %s",
-		    prog, argv[2], strerror(errno));
+		    prog, argv[1], strerror(errno));
 		goto bad;
 	}
 	desired = slurp(fp, &desired_len);
 	fclose(fp);
-	(void)printf("%s: %s\n", argv[1], result);
+	(void)printf("%s: %s\n", argv[0], result);
 	if (strcmp(result, desired) != 0) {
 	    result_len = strlen(result);
 	    (void)fprintf(stderr, "%s: ERROR: result was (len %zu)\n%s\n"
@@ -133,6 +156,7 @@ main(int argc, char **argv)
 	e = 0;
 bad:
 	free(desired);
-	magic_close(ms);
+	if (ms)
+		magic_close(ms);
 	return e;
 }
diff --git a/tests/uf2.result b/tests/uf2.result
index 8dae28d47c03..d93dca954a75 100644
--- a/tests/uf2.result
+++ b/tests/uf2.result
@@ -1 +1 @@
-UF2 firmware image, family ESP32-S2, address 00000000, 4829 total blocks
\ No newline at end of file
+UF2 firmware image, family ESP32-S2, address 00000000, 4829 total blocks
diff --git a/tests/xclbin.result b/tests/xclbin.result
new file mode 100644
index 000000000000..11e31fe5e253
--- /dev/null
+++ b/tests/xclbin.result
@@ -0,0 +1 @@
+AMD/Xilinx accelerator AXLF (xclbin) file, 46226070 bytes, created Fri Mar 25 00:51:37 2022, shell "xilinx_u55c_gen3x16_xdma_3_202210_1", uuid e106e953-cf90-4024-e075-282d1a7d820b, 11 sections
diff --git a/tests/xclbin.testfile b/tests/xclbin.testfile
new file mode 100644
index 000000000000..7a965c15075d
--- /dev/null
+++ b/tests/xclbin.testfile
diff --git a/tests/zstd-3-skippable-frames.result b/tests/zstd-3-skippable-frames.result
index 468070c34770..4982c52d3dda 100644
--- a/tests/zstd-3-skippable-frames.result
+++ b/tests/zstd-3-skippable-frames.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 1
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 1
diff --git a/tests/zstd-dictionary-0.result b/tests/zstd-dictionary-0.result
index e1b9c620a5e4..6fdb4a55de3c 100644
--- a/tests/zstd-dictionary-0.result
+++ b/tests/zstd-dictionary-0.result
@@ -1 +1 @@
-Zstandard dictionary (ID 0)
\ No newline at end of file
+Zstandard dictionary (ID 0)
diff --git a/tests/zstd-dictionary-1.result b/tests/zstd-dictionary-1.result
index dd9f5f1b1e50..623b56387af4 100644
--- a/tests/zstd-dictionary-1.result
+++ b/tests/zstd-dictionary-1.result
@@ -1 +1 @@
-Zstandard dictionary (ID 1)
\ No newline at end of file
+Zstandard dictionary (ID 1)
diff --git a/tests/zstd-dictionary-2.result b/tests/zstd-dictionary-2.result
index e1ac5b3a9d97..3d87c7a72f62 100644
--- a/tests/zstd-dictionary-2.result
+++ b/tests/zstd-dictionary-2.result
@@ -1 +1 @@
-Zstandard dictionary (ID 285212672)
\ No newline at end of file
+Zstandard dictionary (ID 285212672)
diff --git a/tests/zstd-skippable-frame-0.result b/tests/zstd-skippable-frame-0.result
index a4e3e482ce6b..432940ae2854 100644
--- a/tests/zstd-skippable-frame-0.result
+++ b/tests/zstd-skippable-frame-0.result
@@ -1 +1 @@
-Zstandard compressed data (v0.2)
\ No newline at end of file
+Zstandard compressed data (v0.2)
diff --git a/tests/zstd-skippable-frame-4.result b/tests/zstd-skippable-frame-4.result
index cecb5e71a5e6..b6dc7be49a4b 100644
--- a/tests/zstd-skippable-frame-4.result
+++ b/tests/zstd-skippable-frame-4.result
@@ -1 +1 @@
-Zstandard compressed data (v0.3)
\ No newline at end of file
+Zstandard compressed data (v0.3)
diff --git a/tests/zstd-skippable-frame-8.result b/tests/zstd-skippable-frame-8.result
index 528f701d059e..a0a054807fef 100644
--- a/tests/zstd-skippable-frame-8.result
+++ b/tests/zstd-skippable-frame-8.result
@@ -1 +1 @@
-Zstandard compressed data (v0.4)
\ No newline at end of file
+Zstandard compressed data (v0.4)
diff --git a/tests/zstd-skippable-frame-C.result b/tests/zstd-skippable-frame-C.result
index 468070c34770..4982c52d3dda 100644
--- a/tests/zstd-skippable-frame-C.result
+++ b/tests/zstd-skippable-frame-C.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 1
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 1
diff --git a/tests/zstd-v0.2-FF.result b/tests/zstd-v0.2-FF.result
index a4e3e482ce6b..432940ae2854 100644
--- a/tests/zstd-v0.2-FF.result
+++ b/tests/zstd-v0.2-FF.result
@@ -1 +1 @@
-Zstandard compressed data (v0.2)
\ No newline at end of file
+Zstandard compressed data (v0.2)
diff --git a/tests/zstd-v0.3-FF.result b/tests/zstd-v0.3-FF.result
index cecb5e71a5e6..b6dc7be49a4b 100644
--- a/tests/zstd-v0.3-FF.result
+++ b/tests/zstd-v0.3-FF.result
@@ -1 +1 @@
-Zstandard compressed data (v0.3)
\ No newline at end of file
+Zstandard compressed data (v0.3)
diff --git a/tests/zstd-v0.4-FF.result b/tests/zstd-v0.4-FF.result
index 528f701d059e..a0a054807fef 100644
--- a/tests/zstd-v0.4-FF.result
+++ b/tests/zstd-v0.4-FF.result
@@ -1 +1 @@
-Zstandard compressed data (v0.4)
\ No newline at end of file
+Zstandard compressed data (v0.4)
diff --git a/tests/zstd-v0.5-FF.result b/tests/zstd-v0.5-FF.result
index 815c80d39a33..0132e25374dc 100644
--- a/tests/zstd-v0.5-FF.result
+++ b/tests/zstd-v0.5-FF.result
@@ -1 +1 @@
-Zstandard compressed data (v0.5)
\ No newline at end of file
+Zstandard compressed data (v0.5)
diff --git a/tests/zstd-v0.6-FF.result b/tests/zstd-v0.6-FF.result
index b28af6b21947..d4c10c3eac38 100644
--- a/tests/zstd-v0.6-FF.result
+++ b/tests/zstd-v0.6-FF.result
@@ -1 +1 @@
-Zstandard compressed data (v0.6)
\ No newline at end of file
+Zstandard compressed data (v0.6)
diff --git a/tests/zstd-v0.7-00.result b/tests/zstd-v0.7-00.result
index 72e0e27aa907..c4b9c5b107fd 100644
--- a/tests/zstd-v0.7-00.result
+++ b/tests/zstd-v0.7-00.result
@@ -1 +1 @@
-Zstandard compressed data (v0.7), Dictionary ID: None
\ No newline at end of file
+Zstandard compressed data (v0.7), Dictionary ID: None
diff --git a/tests/zstd-v0.7-21.result b/tests/zstd-v0.7-21.result
index a4d43c819f27..254f02766c84 100644
--- a/tests/zstd-v0.7-21.result
+++ b/tests/zstd-v0.7-21.result
@@ -1 +1 @@
-Zstandard compressed data (v0.7), Dictionary ID: 1
\ No newline at end of file
+Zstandard compressed data (v0.7), Dictionary ID: 1
diff --git a/tests/zstd-v0.7-22.result b/tests/zstd-v0.7-22.result
index b4336c9a3990..47ce8d52fdf4 100644
--- a/tests/zstd-v0.7-22.result
+++ b/tests/zstd-v0.7-22.result
@@ -1 +1 @@
-Zstandard compressed data (v0.7), Dictionary ID: 513
\ No newline at end of file
+Zstandard compressed data (v0.7), Dictionary ID: 513
diff --git a/tests/zstd-v0.8-00.result b/tests/zstd-v0.8-00.result
index 67edebd88cd2..701bf4d5fd9e 100644
--- a/tests/zstd-v0.8-00.result
+++ b/tests/zstd-v0.8-00.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: None
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: None
diff --git a/tests/zstd-v0.8-01.result b/tests/zstd-v0.8-01.result
index a1239a71f56a..dc92b6896af3 100644
--- a/tests/zstd-v0.8-01.result
+++ b/tests/zstd-v0.8-01.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 2
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 2
diff --git a/tests/zstd-v0.8-02.result b/tests/zstd-v0.8-02.result
index 82beab8ae14e..c43d921bacd9 100644
--- a/tests/zstd-v0.8-02.result
+++ b/tests/zstd-v0.8-02.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 770
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 770
diff --git a/tests/zstd-v0.8-03.result b/tests/zstd-v0.8-03.result
index 6aaaa197e805..0c4ae74c290c 100644
--- a/tests/zstd-v0.8-03.result
+++ b/tests/zstd-v0.8-03.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 84148994
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 84148994
diff --git a/tests/zstd-v0.8-16.result b/tests/zstd-v0.8-16.result
index 82beab8ae14e..c43d921bacd9 100644
--- a/tests/zstd-v0.8-16.result
+++ b/tests/zstd-v0.8-16.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 770
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 770
diff --git a/tests/zstd-v0.8-20.result b/tests/zstd-v0.8-20.result
index 67edebd88cd2..701bf4d5fd9e 100644
--- a/tests/zstd-v0.8-20.result
+++ b/tests/zstd-v0.8-20.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: None
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: None
diff --git a/tests/zstd-v0.8-21.result b/tests/zstd-v0.8-21.result
index 468070c34770..4982c52d3dda 100644
--- a/tests/zstd-v0.8-21.result
+++ b/tests/zstd-v0.8-21.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 1
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 1
diff --git a/tests/zstd-v0.8-22.result b/tests/zstd-v0.8-22.result
index 9869d24f2671..6d7c77eca476 100644
--- a/tests/zstd-v0.8-22.result
+++ b/tests/zstd-v0.8-22.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 513
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 513
diff --git a/tests/zstd-v0.8-23.result b/tests/zstd-v0.8-23.result
index d38420fed117..1c4cc3a18f61 100644
--- a/tests/zstd-v0.8-23.result
+++ b/tests/zstd-v0.8-23.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 67305985
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 67305985
diff --git a/tests/zstd-v0.8-F4.result b/tests/zstd-v0.8-F4.result
index 67edebd88cd2..701bf4d5fd9e 100644
--- a/tests/zstd-v0.8-F4.result
+++ b/tests/zstd-v0.8-F4.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: None
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: None
diff --git a/tests/zstd-v0.8-FF.result b/tests/zstd-v0.8-FF.result
index d38420fed117..1c4cc3a18f61 100644
--- a/tests/zstd-v0.8-FF.result
+++ b/tests/zstd-v0.8-FF.result
@@ -1 +1 @@
-Zstandard compressed data (v0.8+), Dictionary ID: 67305985
\ No newline at end of file
+Zstandard compressed data (v0.8+), Dictionary ID: 67305985