From nobody Fri Jun 5 15:34:39 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 4gX58d1FPWz6g2lr; Fri, 05 Jun 2026 15:34:41 +0000 (UTC) (envelope-from siva@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gX58d0gyZz3tWB; Fri, 05 Jun 2026 15:34:41 +0000 (UTC) (envelope-from siva@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780673681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TruwcZ6iCB748hdnc7OR+U0kUZc+6l5oVJfIc1ueao8=; b=BHU+Xr4eBt5arBaOthzGPM/UcuLp4Oaa4ktYk2R66PRt6IEaBghkjsCalqym7Zq8TB0P8R zCi/KCFMMXq/3FK6tus7fpszD1ByzLsE/O1yiQNZsqzvRxRCuEEw1vFhV8eDPfzFkyt23V FEFUlstB/WwrVxlV82FohjTKYHyVJb3V7tMSa1cFonHBpwmhd0EM9oAHeuMxYCQE5FDxnn H9AxksC2FWAIo0p0akXa0m8WS+q7s/5Q+PRc+x/aemSmcOT2cyOtXNpz8TwCc8KjPl5e4Y 8FguJLwZtTT86kPTTsUAEWEJ7ztgTVvzzr/XK/nDgvgjpgz5JGu05VZMrgou1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780673681; a=rsa-sha256; cv=none; b=lgL4pyO2V+cJBoqOnzemiXsl5HElutrbNMUeNGq9AIcnXMy+2oXg+AFIkNcnkaWN419IrH Qa1YRz9sesVilHTnHsjK5lQfXowmWJskzwWXFWNYu5JUQnQhKnCWgJwiK7el1P5VeAhkLC DlPtib/Q4sgcvc3/3kdFF/HK6IE+NsgiYSUMCGk84gvAsTxhFe8EYunQM7atLVoxOUsgpe ySiElwn0wngdrolw47YkeeIZnqj0Agtkiwqhc5mlHUzrzuuyD+WX3i6GUAcqu+fQDOWGaV KOtN80/wkUMJ+c8kotFvJHpMGMp5rXW76nqsE3yr7pmcvHqoL0xaMjHlNVeCsQ== 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=1780673681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TruwcZ6iCB748hdnc7OR+U0kUZc+6l5oVJfIc1ueao8=; b=I+zRgsBpFoEnEDs9n57A6GdXwPCuEMPXIa2XE83KbixsdgfLzrOqtHn8XKx/gxFVciuucr t1MvaXYdNh250unDthM4+R3g7Ws/hcerjPX7I2ugi5RKhIqlbywFpTiJ+6JnUDgMJUeAYC qDNZNyP/li8g9TqD+sfb2l1K2E5fZgqLPrvRO75ROriCc6kM1PWrD0tLstUKtBdPkfCbyY LxuLUbsOkBULdoa7tLm2yfc7xek/cL/InFEUuFjKc1Paht/rY9UONQF5ugdOUMUuyXJApw p7jE9Gaap8a0KvQ39PRTfDmPX+rjW3bleLJwT6AcV5w/70LgDYD1Pl39lNajxA== Received: from localhost (unknown [IPv6:2606:6d00:f3a:e400:809a:aa20:9c4e:104e]) (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) (Authenticated sender: siva/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gX58c62Q7zQr1; Fri, 05 Jun 2026 15:34:40 +0000 (UTC) (envelope-from siva@freebsd.org) 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Fri, 05 Jun 2026 11:34:39 -0400 Message-Id: To: "Xin LI" , , , Subject: Re: git: f7c0bd206fe4 - main - file: normalize .result files to ensure trailing newline on install From: "Siva Mahadevan" Cc: X-Mailer: aerc 0.21.0 References: <6a225608.1ec12.2e89b207@gitrepo.freebsd.org> In-Reply-To: <6a225608.1ec12.2e89b207@gitrepo.freebsd.org> On Fri Jun 5, 2026 at 66:00 UTC, Xin LI wrote: > The branch main has been updated by delphij: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df7c0bd206fe4f3a956b3ecb4dc= 11a7386b85fa22 > > 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 > =20 > Some upstream result files introduced in file 5.47 (e.g., bgcode.resu= lt) > 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. > =20 > 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=3D tests > ATF_TESTS_SH=3D file_test > =20 > SRCDIR=3D ${SRCTOP}/contrib/file/tests > -_files!=3D echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.resul= t ${SRCDIR}/*.magic > +_files!=3D echo ${SRCDIR}/*.testfile ${SRCDIR}/*.flags ${SRCDIR}/*.magic > +_results!=3D echo ${SRCDIR}/*.result > ${PACKAGE}FILES+=3D${_files} > =20 > +# 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+=3D ${_r:T} > +CLEANFILES+=3D ${_r:T} > +.endfor > + > .include Thanks for the fix to src. I've submitted the fix upstream here (needs an account): https://bugs.astron.com/view.php?id=3D775. We should revert this change after `file`'s next release.