From nobody Fri Jun 5 04:52:24 2026 X-Original-To: dev-commits-src-main@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 4gWpvY5Qv9z6gN5Y for ; Fri, 05 Jun 2026 04:52:25 +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 4gWpvX6DVXz47Nc for ; Fri, 05 Jun 2026 04:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780635144; 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=aFBZUaFUQbyAezew/rdVTZibYU+pCJS9/9OQ7LlRBlPkKK1j4f8xzgKyYr1JvKYWdB7rhX 7LTU6oS+blFYWpmtGoG7PVdshSUpvVC86UH2i1EeWYC7mvpB5q+DZV7h2WKBlYvsFMMzub T0EzJVEWoB02WxvrzPlqzdCyXqyP8pfyfT8NpUIuhY0CTSzXClzE94WWLhSdsYN3dn1w2K 1C/O+MpAWPY2rJ7JNYXfjRfzoUWtQflBGjfj51C5HMxBtiMQ1JORAWARUguCRuPWuFo+T9 Ird5+Wi4m1owvSX+1uG0wciOOFNoCCh9dH8qwCCgxJbr6nu1OALsSJBLF+OgXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780635144; a=rsa-sha256; cv=none; b=xC2P5QqdcYeRYixit8IzOpCy31RbnJxaeGhKC2sVqjtMC5fV0Zje0fM4WDZjeP+crk3fiS uRxD0aZzvrRUf2Qq7gVJh5HCwP2E9IFeUlV6I2wzX8aYCL+xBC8IDLzAkfIo6zxwvJMw76 45FSa1zkSNbti+EfMAT1cfvFPWR4wuw1MZ/rlA9AkzBCK3NYr2f9UCPOulwetaq6SpVaY6 dseS/vjvdan0fJQkbK2iVtIvHfWVORN6Ze4vHXsdh6zjLl11VIinzVf3TC7cMhB+ctYu34 C242eSF0k+c8E2BZ+TaEpYDOQqXjV/PkbAHHXnt8sDYRERuH0hKGXn8gBComMw== 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=1780635144; 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=Gqj93hsr6F+BXExTscOKvr0tu2srVzesAmH+Q0OeUlDL5msCUvarEz/G4fH7zx9ow5ldQX HVE2aG1N/U6fEyBnG/WB6nZ6LUhphvZkt85bhUcrMzuvsdQuxvLKECivOgTusw/zdqkdvY GeGWX16W2QvK+dHqznQFPxa1B7gTQB3ciTIT2n1TJhd1LKe0y5l5T4utwrRR3QJk2iYu+4 SYFmCrDmutDq2Sz/9sYrumTSlnfKddQMU5KmY/q1v06WriOk+wLPg95DiIFzXaH1t2E4aj 8GNj481MlA7vVhpoXEw1oBafWX9UimNM8pc/tbfXGRU7SagdOBf5KjCfoRxuxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gWpvX5pz0z1SQ8 for ; Fri, 05 Jun 2026 04:52:24 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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