From nobody Mon Mar 31 21:35:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZRPYY0K43z5sb6N; Mon, 31 Mar 2025 21:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRPYX6BpSz49dt; Mon, 31 Mar 2025 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743456912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDawhuA8u2CSppTx7Cz170MQNx/X8D8uHU/BRd7zePA=; b=Q6M9SCEa2d/D9nvMUnalS1CJWkhkegwYS4sMQctOssEUAaP9McZko8rXSYhJqv2FBHfAXo lp1GFZVxNCvhv8PRrcz8RtWvdWqwfFH7c/7GAIoMSWBL2XW3ESsRSFD9gqScAxwBAW6lBc bkoRfrL9nFpgcwg6QUrFQTwBaWLa4ziAcB1NA8rEzsHf5f+5nCIsY0IAvW/2FdG9Q7nOan 7nYJ78KejBB0IhLXPyKKl89cZOMZWWG6yesjQhiYo9mFBFaO8VwevkEVJzUaKejayrDMBA 2fd6NI04f9ipSlmVIWzPbmxahhpdbkkbJ7MCksN3IuqHxe5fXq+rsmpWr2ysUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743456912; a=rsa-sha256; cv=none; b=q7dXvrt5cApsnDJcXmGJq0ZhurZzmvMleXs7Xx5u1FdxtmZkYUjB3hQNENzyEvWa8HdVB5 CXOCYg78T3ag5wyayDL/JvNVsC4TYM5ZS8a/it01HYWIPJ9zPm7dUkwf6dHLcsJn0iBwjS XXZApoOCTajSB5MMD08OjeCRf57So4pTKSlaeiDAPGfXR5nyBBfU4rjVpJPP0SDRGChp0X uK1iaEijLyYj/oqneeexSuUQj0xm/Rt5KwXoApfAUdJ3XoaZcLSx9NyrokAA8R29ZPhfGN a8nK/55sSGLPRKZm8KSHKDlAwPbJhqtx0bc+0O02iipSNfbFwRRVv04fKkoc7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743456912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iDawhuA8u2CSppTx7Cz170MQNx/X8D8uHU/BRd7zePA=; b=th+QxSM24ZxGi96wfvjGSHbqy0ZgW6MpnPjbq6FWYJf417aRrEADAV+XeWm38HHpILjd2x +KsL5eE6P9R3stvVTsAiIi9EZTeS9kCw58xP0LIHCxIOLvpfPZ1jryRiJAy8epAxQYcQ+J TxtcFisfa/wDr3Uv9gxnujg9g+LDz2IjF5LLcBatt2DdflU+OtlaoKEFEAbkykKmxZgpQe T5Ue0U1Aydt0R+ZN4woDvaMJ7P84to+0i9uENdqwJz7+lwmFjlxAZfE7rWSUZAP1YMSr3C GSgF8DQGIQsKoOEc6rY+520/C1bcCborcQMn5UwQ3WlV0dYYIuZP90YxIYABoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZRPYX5my6z11vh; Mon, 31 Mar 2025 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52VLZCig093047; Mon, 31 Mar 2025 21:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VLZC0o093044; Mon, 31 Mar 2025 21:35:12 GMT (envelope-from git) Date: Mon, 31 Mar 2025 21:35:12 GMT Message-Id: <202503312135.52VLZC0o093044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: ebd127c3e36c - stable/13 - file: Support testing multiple magic files. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ebd127c3e36c1f02a7a9b2d63621040e7d1a00d4 Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=ebd127c3e36c1f02a7a9b2d63621040e7d1a00d4 commit ebd127c3e36c1f02a7a9b2d63621040e7d1a00d4 Author: Xin LI AuthorDate: 2023-10-09 06:06:20 +0000 Commit: Enji Cooper CommitDate: 2025-03-31 21:34:46 +0000 file: Support testing multiple magic files. This is based on upstream b74150490be904801378b2712fe0d532e1700124 but adapted to ATF. Reviewed by: jlduran@gmail.com, markj, vangyzen Differential Revision: https://reviews.freebsd.org/D42129 (cherry picked from commit 8f75390c66bdcde95e1b383aecaa27b4adf88279) --- usr.bin/file/tests/Makefile | 2 +- usr.bin/file/tests/file_test.sh | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/usr.bin/file/tests/Makefile b/usr.bin/file/tests/Makefile index ea0ebaa12ce2..cd3d00ae742c 100644 --- a/usr.bin/file/tests/Makefile +++ b/usr.bin/file/tests/Makefile @@ -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 diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh index 02d494b0f643..490274c05892 100644 --- a/usr.bin/file/tests/file_test.sh +++ b/usr.bin/file/tests/file_test.sh @@ -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 }