From nobody Wed Mar 02 21:57:28 2022 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 7A29719E0C81; Wed, 2 Mar 2022 21:57:31 +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 4K87JT0JBrz3KHF; Wed, 2 Mar 2022 21:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258250; 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=Pvia3wUp7MOv0eG93j3wmesHgPlzr4TqiDLF6u8bi0E=; b=j9Z2ZG8xTgF8np6p0/Zmd5FsXWaIpsMdNf1LfNLwXMbtVnFoqgDiSuOstdBusBmteKIjKZ uaUYyqjhXGk48wJa5moJmNGZa6M+FKYfD5+TQeHu6u6TlfXNWro0uhkZ9IFQ7iQhsVZIr6 Azjtt9Nvv5kJV4pMjD3cZD04a8p974LV8ioIZTz23YINetGRSlOceBcox+He1KExAGzsq8 QasWdHb5vx+1xkiw0ruJMdQtOP1egnY4dQCstiOu0+gp1Bl+2/xjTFWAicdWwRaCRePN64 K2/IqiOsCju99odflhHRzJA0RWKs8psKOCGLh0Jal18+wW2XynBIcMJ71ifeXQ== 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 58C14388E; Wed, 2 Mar 2022 21:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 222LvSuI065270; Wed, 2 Mar 2022 21:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222LvSG0065269; Wed, 2 Mar 2022 21:57:28 GMT (envelope-from git) Date: Wed, 2 Mar 2022 21:57:28 GMT Message-Id: <202203022157.222LvSG0065269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 22561b00abac - stable/13 - Integrate contrib/file/tests with kyua/atf 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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 22561b00abac7dd1b933689005a7563f88ef0e84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258250; 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=Pvia3wUp7MOv0eG93j3wmesHgPlzr4TqiDLF6u8bi0E=; b=IxtG/qk116jk+BJdsBrHMSPrt8lA7sFv291ifgmk4tty4B4i4OMQo2ZNyiaUS5alniOYtF MO5r58WYtP2c9Ctc7ngaroXRbHDZNyqlvBCiVCSDK6dwj+rvlJ0iRiBXHJ1iLSrOfz1w8S LJRm/qahR2oJHh4j/Kol7O0wlGVcw4oqhOgwa88X+SZfcC8peQN8SNFbdcLvbR77J/FF6b 22Jr54Lo0CrFzPsEM5/HQ1WJG+zcd0MpyOUL7RJa+v5VEiZUuBF7ZFK2euisGp52v4tERl 3aBmrjz7xTyt+Xym56ynwXxXW2/pdb9Gbkwmuha0AqVvHJk+lRrn1vx0q9gKjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646258250; a=rsa-sha256; cv=none; b=r4HK5wQAO9Anif21xxAVNb8XLUymu77Jtv+fcyrMBjWo7M7fHkJutkyQGBMLQltZZ0XI1T +Um/u7HQcJcEy4QQTr+hpzMfzVJ1UpnuQep/YywTvG7EmWUt77t4waLQBInlfDBai/GmsI x4UUX9kH7lzwzfV5BdLGVgxNauIYvJYQVihKP88bla1614OT1HRt81/2FmFWhDmrcSkY6U XMiNvgDXow2YiYgT8Mgs1DVCUT7nvrAVcaPGXYT7HnAtJ7vEzkiKGYvAK7+vzuSofMMFmG J9Ef2V7U3nZxnjSqvm6yVaWkmD6yqw8H/cGM4HgUStruJULlJtsf9OIRYoH37A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=22561b00abac7dd1b933689005a7563f88ef0e84 commit 22561b00abac7dd1b933689005a7563f88ef0e84 Author: Eric van Gyzen AuthorDate: 2022-02-16 15:50:43 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-02 21:56:31 +0000 Integrate contrib/file/tests with kyua/atf This could be done better by making each test a separate ATF test case. This exercise is left for the reader. Reviewed by: delphij (earlier version) MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34303 (cherry picked from commit 1581ec9a4502c1f0e4f0ce290190864abf946d6f) --- etc/mtree/BSD.tests.dist | 2 ++ usr.bin/file/Makefile | 5 ++++ usr.bin/file/tests/Makefile | 8 ++++++ usr.bin/file/tests/file_test.sh | 54 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index e3195c47ee88..75fbc64dce9c 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1006,6 +1006,8 @@ .. file2c .. + file + .. find .. fold diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index f31c50ad86da..0a7c327c91f1 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -20,6 +20,8 @@ # ever read sources, credits must appear in the documentation. # 4. This notice may not be removed or altered. +.include + SRCDIR= ${SRCTOP}/contrib/file .PATH: ${SRCDIR}/src .PATH: ${SRCDIR}/doc @@ -38,6 +40,9 @@ FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ CLEANFILES+= ${MAN} +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include .for mp in ${MAN} diff --git a/usr.bin/file/tests/Makefile b/usr.bin/file/tests/Makefile new file mode 100644 index 000000000000..ea0ebaa12ce2 --- /dev/null +++ b/usr.bin/file/tests/Makefile @@ -0,0 +1,8 @@ +PACKAGE= tests +ATF_TESTS_SH= file_test + +SRCDIR= ${SRCTOP}/contrib/file/tests +_files!= echo ${SRCDIR}/*.testfile ${SRCDIR}/*.result ${SRCDIR}/*.magic +${PACKAGE}FILES+=${_files} + +.include diff --git a/usr.bin/file/tests/file_test.sh b/usr.bin/file/tests/file_test.sh new file mode 100644 index 000000000000..e6e398f6e51d --- /dev/null +++ b/usr.bin/file/tests/file_test.sh @@ -0,0 +1,54 @@ +#!/usr/libexec/atf-sh +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2022 Eric van Gyzen +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +atf_test_case contrib_file_tests cleanup +contrib_file_tests_body() { + srcdir="$(atf_get_srcdir)" + + for testfile in "${srcdir}"/*.testfile; do + test_name="${testfile%.testfile}" + result_file="${test_name}.result" + magic_file="${test_name}.magic" + file_args= + if [ -e "${magic_file}" ]; then + file_args="${file_args} --magic-file ${magic_file}" + fi + # 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" + done +} + +contrib_file_tests_cleanup() { + rm -f actual_output trimmed_output +} + +atf_init_test_cases() { + atf_add_test_case contrib_file_tests +}