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.

MFC after:	3 days
Fixes:		e949ce9dc0

This commit is contained in:

Xin LI

2026-06-04 21:47:08 -07:00

parent ad524568f9

commit f7c0bd206f

1 changed files with 12 additions and 1 deletions

									
										usr.bin/file/tests/Makefile
									
		+12
		-1
	
												View File
												
				@@ -2,7 +2,18 @@ PACKAGE=	tests

				ATF_TESTS_SH=	file_test

				SRCDIR=		${SRCTOP}/contrib/file/tests

				_files!=	echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.result ${SRCDIR}/*.magic

				_files!=	echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.magic

				_results!=	echo ${SRCDIR}/*.result

				${PACKAGE}FILES+=${_files}

				# Generate normalized .result files in the obj directory, ensuring each ends

				# with a newline (some upstream result files are missing one).  Install those

				# instead of the originals from contrib.

				.for _r in ${_results}

				${_r:T}: ${_r}

					awk 1 ${.ALLSRC} > ${.TARGET}

				${PACKAGE}FILES+=	${_r:T}

				CLEANFILES+=	${_r:T}

				.endfor

				.include <bsd.test.mk>