From nobody Fri Jun 5 04:52:24 2026 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 4gWpvf3YPjz6gN5c for ; Fri, 05 Jun 2026 04:52:30 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWpvd6P0Jz47tD for ; Fri, 05 Jun 2026 04:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780635149; 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=nbo8FgUOKVaydaCu3NweeGYKDvQqchttK16kMz+2FZk=; b=YJd6yxCzrVXjS0S1bUUeINc3DEMDKDHf3pJwe2l1BOD+9udWQsJMkQ52VYMxRPSijlWjZC HNLJQMcXHCK4AtzqZJ9T34URNcIHcHXIx8n7fDFz2+QWPnP6G7Md/tc209FhIWZNOu6U87 8tqwks8i/zd5/dML/y+tBm43sTPLB483HXyBlHqe9d8Amf/sbvr19qZKRfzyirH1F8FRmp xT1/rTemqK1XbMXIoK+OCZz2bgNVISefFlzF+XNi0GEPS1/feMba1KKCvd8ggzCVa+Kmsr ipF6/imPKsFKm3hFMJ9mZUDd/svK3GKruy6wvkFKbf1+LdqP7yN84GUKfXecVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780635149; a=rsa-sha256; cv=none; b=EQN8kWyg3vFMUGVjNU6H+13UXzsVi4PCGYV0U41lNoPoWLOVxhDkfXEh3EcxkQLdh+RESB u5KBtDfLSwpnms9RKuFy+59kQHwWlyp/pgNsEYXYa3pHNx57OxWcZwBc0qwYxzRKdID8KY KccqZ0edRfe6jqkeDc5j49AkMAcVYcQ3aM6ckjhb0RNyTHBe1h3pBdPI9WmTLCzzRY5dXz fJzV++S5gLQqPLqNGkuHIWdBnidudCL09ZlfkrACs/dRNVi7Ri/qSVVXJMVa65zBeTN50U dP+IeFhHBzdBcj88Mw4PNXihzYzGY9BTIcCozGtSjaxJh7aNUXbCJ9VQDamUMA== 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=1780635149; 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=nbo8FgUOKVaydaCu3NweeGYKDvQqchttK16kMz+2FZk=; b=MNTVCWGL0MqQNiGkG5Dz4gguGUqtjGiCU21vKUP9GjCw+4IGxYWFUiZ38MJ4fy8d46xLRJ dIgT3fThnoVUAPKJK9KRO2X4DEAJKPfCNNBTrAkeZ5Ic6/H8KyJyaw1vqlRu3XhXihtrwc /pMECOPGispfoSYVKSDFpuR0TgCGWQ4RUzkdlKY4vNESr1vhIZOA7MJdqBynvk/ugq0MdL fAAnAl0qWP0NJcTVv2B+PA6V8NRgOL2ajuzTXa1AGrlZIh0MxhEWMgHX0HhDDIi9CDNl4d TxnIsz7yjHSKDTsZNCJAR3PLjbuAedQQJjuj+vArKXxrr0MD3yRrAy6Hn2yH2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWpvd5nSfz3r for ; Fri, 05 Jun 2026 04:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 04:52:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: f7c0bd206fe4 - main - file: normalize .result files to ensure trailing newline on install 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c0bd206fe4f3a956b3ecb4dc11a7386b85fa22 Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 04:52:24 +0000 Message-Id: <6a225608.1ec12.2e89b207@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c0bd206fe4f3a956b3ecb4dc11a7386b85fa22 commit f7c0bd206fe4f3a956b3ecb4dc11a7386b85fa22 Author: Xin LI AuthorDate: 2026-06-05 04:47:08 +0000 Commit: Xin LI CommitDate: 2026-06-05 04:48:19 +0000 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: e949ce9dc0e6fff26e83904f1008b76d36ba0a37 --- usr.bin/file/tests/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.bin/file/tests/Makefile b/usr.bin/file/tests/Makefile index cd3d00ae742c..cdbe994e1c93 100644 --- a/usr.bin/file/tests/Makefile +++ b/usr.bin/file/tests/Makefile @@ -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