From nobody Sat Nov 4 03:07:11 2023 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 4SMjFr1j3Bz50Ny2; Sat, 4 Nov 2023 03:07:12 +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 4SMjFq6sQYz3MwM; Sat, 4 Nov 2023 03:07:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699067232; 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=WXkzmmxyKkGzvtfbaih+2Hd2Qph3+X1+EjsuR5gQpuE=; b=nNKa5MgFzOA9rpWCpKZAZ3RkhQ0d7NizENT5BhFEk0uK0ygh9Wxz1Gc0Hl7uJZKF4wnGzz t2RsOvM6yAHHvaPc7rdcvjOwTiQgfdKnyd3DKkdt/XDQQFR8hQI+GKy9dSagp7EbKyZrSN xnKmdvBltK9uLEQD5fQ1AhgR8sRHnJQv/hau4L25bsaXe9r1IAnJJT2tL4THpkoUVNbWr5 TOJvXLCkX5MUa4onBd7Z3Nm9AKHhwjr6HKdZsgZZpthHocr8ZVb8ar9Qgrm4yL0WnAesKI HeNw7JGm6lKjKgllLzdvo8vHDYbH3ARD2+RAJ7PTtssGX0jP9wNjkqTug08OlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699067232; 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=WXkzmmxyKkGzvtfbaih+2Hd2Qph3+X1+EjsuR5gQpuE=; b=G67BQNErm0PkUzhtWyZRZc/t9vw4fpTKHvAD6KEB9cXdc0R5KfO4ON/fGFIyII0JZR2lUV YcXWcPTVId24hj/3gYef2cOzuTdFrBQFueHgu5Y8T5gvXoWhXa//NcPSOlJnfKhlc/Rt9X 3Dtxm2yrJcsD1z167On/p0Q9Jmk87OsJQl9oOATVLIP9vePU2B0DhfLHv/GXnUQwiq1DeS /ye7Hkr9K5P2mbq6Xgeq2cs1W3onmeOtKWedxbREB7NnQRmVAMI4VeYcRhrbsd+mS8Ge0q LGh0R2RxbxJfKpiZQ9qiuJBnwAAnf2Dj+itdz4ru9WOhcHtfkpS942qCI78olQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699067232; a=rsa-sha256; cv=none; b=HF5MioyXOId2nGrVij7/jivoQh5p0919ZZgWLHShOIH6Kexdy39i7vDh+72NCurEFMDu55 ZuOvn2dBzru/RT9kmo57R9PfxOhfAk2VloCMdxc8lm/QEXtMDb7601MeIsphLlqK0ejfA1 LjjVAdXKci0dbTjvhZQbC+amgYJ2kclobaRmJjqrw8nts9AXZOggrHY8+CEhcpKK+dLttS t1B9giSooc3pgzjzI3ZlhP7SKBX7/GXY8A2oM3YwAEAbjjh/tSQsbefWX5aF+pKK1Q3/fm 5HBUUfK4CIKrVGh8CMugZPHuzF30ecZhX4JpRehbh6aZIbrzpi62eZNvaAYLMw== 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 4SMjFq5wr1zh14; Sat, 4 Nov 2023 03:07:11 +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 3A437B9Y085005; Sat, 4 Nov 2023 03:07:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A437BT5085002; Sat, 4 Nov 2023 03:07:11 GMT (envelope-from git) Date: Sat, 4 Nov 2023 03:07:11 GMT Message-Id: <202311040307.3A437BT5085002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3ca5da36ebe - stable/14 - file_test: Fix file test 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3ca5da36ebee7efb6ba38cec72f57127e302ada Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ca5da36ebee7efb6ba38cec72f57127e302ada commit c3ca5da36ebee7efb6ba38cec72f57127e302ada Author: Jose Luis Duran AuthorDate: 2023-10-07 12:47:29 +0000 Commit: Ed Maste CommitDate: 2023-11-04 03:05:19 +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 (cherry picked from commit 0d3a87569f14b0e48826bbaab5e05f35669bcebf) --- 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 }