hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-11 04:42:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

file: Support testing multiple magic files.

Browse Source 
This is based on upstream b74150490be904801378b2712fe0d532e1700124
but adapted to ATF.

Reviewed by: jlduran@gmail.com, markj, vangyzen
Differential Revision: https://reviews.freebsd.org/D42129
This commit is contained in:
Xin LI 2023-10-08 23:06:20 -07:00
parent edf8578117
commit 8f75390c66
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/file/tests/Makefile
View File

@ -2,7 +2,7 @@ PACKAGE= tests
ATF_TESTS_SH= file_test
SRCDIR= ${SRCTOP}/contrib/file/tests
_files!= echo ${SRCDIR}/*.testfile ${SRCDIR}/*.result ${SRCDIR}/*.magic
_files!= echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.result ${SRCDIR}/*.magic
${PACKAGE}FILES+=${_files}
.include <bsd.test.mk>

22
usr.bin/file/tests/file_test.sh
View File

@ -32,14 +32,26 @@ contrib_file_tests_body() {
for testfile in "${srcdir}"/*.testfile; do
test_name="${testfile%.testfile}"
result_file="${test_name}.result"
magic_file="${test_name}.magic"
file_args=
if [ -e "${magic_file}" ]; then
file_args="${file_args} --magic-file ${magic_file}"
magic_files=
for magic_file in ${test_name}*.magic; do
if [ -f "${magic_file}" ]; then
if [ -z "${magic_files}" ]; then
magic_files="${magic_file}"
else
magic_files="${magic_files}:${magic_file}"
fi
fi
done
if [ -z "${magic_files}" ]; then
magic_files=/usr/share/misc/magic
fi
if [ -f "${test_name}.flags" ]; then
file_args="${file_args} -$(cat "${test_name}.flags")"
fi
# The result files were created in UTC.
TZ=Z atf_check -o save:actual_output file ${file_args} \
--brief "$testfile"
atf_check -o save:actual_output -e ignore env TZ=Z MAGIC="${magic_files}" \
file ${file_args} --brief "$testfile"
atf_check cmp actual_output "$result_file"
done
}