From nobody Mon Oct 09 04:45:19 2023 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 4S3mg34Nlqz4wNdR; Mon, 9 Oct 2023 04:45:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S3mg33vxyz4NrZ; Mon, 9 Oct 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696826719; 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=6gYLbdz1JzUNNbRSTauJ6HqeFI+AeRZIb1UA8VgjjgQ=; b=SPRH0+KpmMuxik4rA/CsiYMBHDoxwmgDQht/gCmwdjo1wPAU818k1v1/fiphN82zMTHXNQ 1gdxdD/bflZbyy6PTF8sPSJz+lM1JPYm4AdoeUG6p2+heVY4NjICejHNRJdvMiYw/5jpAo GIvMIe3qMgX/Ej/zMsRFk7t2oR13Q5kMb3WYEAWsJimezZ0i1QbfaHVncSOM+7VEQzR859 pQvGT3Xu3u0EOlMoTDLo6Lyba7db9CsozyMi8gkr4luvXvK3DTR8V0O9PVSSMU7XWBbV63 sM59OGF+re0yb2KDfVveZ7jfUyyNXsOO5DO0KYs3ZP0tn/U6u2ggl11Wzf6aOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696826719; a=rsa-sha256; cv=none; b=cB+HcKsQYxsil30kTR31fLxSgzZimYvIvshPaEGXUXaxIHftJzDqOs5aAa9cfCAA50vNSt He0MAedGgSGj+gVES2394AzTy+mtuLCW2x7haXGvCNPud/oZg5BxIRK3iRwE/33VC2lDnc 0inxdConzZ1COcCUW1lUI9+hY78r/7Gs1XWwk6D0yPHg/HMwS2/BXCAQYq2Hns0q5pj/2P Oc6OiGf2qA6P3j/WNFdOTbdAQOnS6pPQ9lJYboqVTwu4IkRDGkWiWbKn5djNvUqPQDrTHC ZB8sPglDhWk7/26B94QuhmrKB2P/cCKJ0egfTjLZD/LfplW2Z4x9Ic8h3A7WrA== 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=1696826719; 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=6gYLbdz1JzUNNbRSTauJ6HqeFI+AeRZIb1UA8VgjjgQ=; b=bzhC1Mw1fFl8Xe0U/upwaO4Hrskh9aLCExLT3oBV5sxQJMOyMBnC/ep+kNM3TZ6Bs9HKko n2ILX3S1VvsMQwYZBlM2U2Kcl2USZ6cEx1ALhYyZ1E37X2yFJ4SrRsg+j7lWEhzmoA987U BR9BLqQLF3nlbALQ0cAskkne4hqqzAqaBPjmjMEHR/G5e5pA1U2iwJoJgXxN7gxSmgh0Ns 1az0fA7/doZkI+JSWHH+zG4bVaDdJnbUD9/fwf3Zsd+HZGPAUUCuqNVqpZ9QrH5Zuo0l9d Fjnd69RQQ2fOAgzYdvD9QLfGHP5+wbjWXiemK6R0s7b4L4UVS2rtk3vU48LZLQ== 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 4S3mg331GQzhvR; Mon, 9 Oct 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3994jJHB023781; Mon, 9 Oct 2023 04:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3994jJq3023778; Mon, 9 Oct 2023 04:45:19 GMT (envelope-from git) Date: Mon, 9 Oct 2023 04:45:19 GMT Message-Id: <202310090445.3994jJq3023778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 0d3a87569f14 - main - file_test: Fix file test 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: 0d3a87569f14b0e48826bbaab5e05f35669bcebf Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=0d3a87569f14b0e48826bbaab5e05f35669bcebf commit 0d3a87569f14b0e48826bbaab5e05f35669bcebf Author: Jose Luis Duran AuthorDate: 2023-10-07 12:47:29 +0000 Commit: Xin LI CommitDate: 2023-10-09 04:44:14 +0000 file_test: Fix file test Trimming of the line feed is no longer necessary after https://github.com/file/file/commit/d993c6b0db20711b2c4cb9d2bee8c7f2e59b0a43 Currently the tests: - bcachefs2 - gpkg-1-zst - multiple are failing, but a fix will be committed upstream. This also reverts c5e957ad4 "file: fix test case for gpkg by removing the extra \n." MFC after: 3 days --- contrib/file/tests/gpkg-1-zst.result | 2 +- usr.bin/file/tests/file_test.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/file/tests/gpkg-1-zst.result b/contrib/file/tests/gpkg-1-zst.result index 10379834d4b1..e99149450b1a 100644 --- a/contrib/file/tests/gpkg-1-zst.result +++ b/contrib/file/tests/gpkg-1-zst.result @@ -1 +1 @@ -Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression \ No newline at end of file +Gentoo GLEP 78 (GPKG) binary package for "inkscape-1.2.1-r2-1" using zstd compression diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh index e6e398f6e51d..02d494b0f643 100644 --- a/usr.bin/file/tests/file_test.sh +++ b/usr.bin/file/tests/file_test.sh @@ -40,8 +40,7 @@ contrib_file_tests_body() { # The result files were created in UTC. TZ=Z atf_check -o save:actual_output file ${file_args} \ --brief "$testfile" - atf_check -o save:trimmed_output tr -d '\012' < actual_output - atf_check cmp trimmed_output "$result_file" + atf_check cmp actual_output "$result_file" done }