From nobody Thu Jun 15 19:28:03 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 4Qhsl76JR7z4d8ww; Thu, 15 Jun 2023 19:28:03 +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 4Qhsl73sXRz3nW4; Thu, 15 Jun 2023 19:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686857283; 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=SM+/lNOQhc6doFjTxbK1dz4Dt0Giz6jW5dmBaicPkRw=; b=TEvZ+rcYgOFkpdHT4u/pCJwpCJHO4vvRf0MdJW9M0Ry7j4k8/Xgra/t8293tK1beWKMNfv 3Tnpr26vRi1qIsRUvh1PqlNcFpn1JH4VCIeATQeItjWqWar9pvxNMqK9FPTYKezbaPPHhy ukWuGggEccvF97T6l8H0B4QXcWYK80+RnLnkxgn92IrV28TU4JbkEDMcMbEihJ2TEOfSTx 8Hmgxn3QERfgaNHCGLjvnxCy3wClII+zIF3GqpJzwO8jiu5d5W3URKWkr7DghpURWClGSf EV+AA1a4jTgTRQeAwmtoZGbxVTzi4DiyPu65BGxiv/Y00bu/3WfxPFsehnFD5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686857283; 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=SM+/lNOQhc6doFjTxbK1dz4Dt0Giz6jW5dmBaicPkRw=; b=MRjht4+T7WICBEY19Myd0bPfTo6d9ODxGRzSI3d/ie5Txm3+fXLGkKtEVLTXxQgGDANutx EqLjBHYF3jNTshiD6YH7dBcPTFzVdB58RnSrqRBHtcETagKwNQt4qxilVMfv6kKpuGuGwh PxcueOEdSi5NGxf7H0o4CSbY2PjeZmbLgOQjN42CWC80e1iascgbe+b13G7MsVfYCDRNlb DF5S0VcM9ezQUFRVC6eJ3b8pPufs/ha6o2asYo2zA21yfmSzKAbe3AJBN0e3Mxj6RG4jCZ bvokY07tfzKLbzqJDISSzOrlfwE11KTUG7H4RSAogzOEaqsHxMcUX/uV5NuU8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686857283; a=rsa-sha256; cv=none; b=pqDQrj0+D4dxv7xUjEad546jyjyE60fZfRLHeYBw3c+AgOo6JKQO3/HsEhtTt0lG0ksJNl rHwxZzV9k1rIyduRki3CLLc0TbG1NtqNVU/bcC007Kvo5LY+D/sZQDkXUJrVXOA8LQc3s9 jIQqihHALYzPVbdts/+wBUjuOxvGvTHFDHyuaa0C1QLRmNijcECpV5w7njbiGHNeCyLiYc dOAo3KEMrMYTOGngYNa8FwHP84+g8xshSm+5skFWZ/sYiAUlcEj1G0pxKJtMK8nVl3qVMW y/JiOHf/6smQzpKpdfIKK24QE/aM6kzVC9b2bvsiteMAc2W+QQXbrGi8a2wW/A== 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 4Qhsl72kJBzy8T; Thu, 15 Jun 2023 19:28:03 +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 35FJS3cH065417; Thu, 15 Jun 2023 19:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35FJS3vr065416; Thu, 15 Jun 2023 19:28:03 GMT (envelope-from git) Date: Thu, 15 Jun 2023 19:28:03 GMT Message-Id: <202306151928.35FJS3vr065416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: b7412da2e122 - main - asa: Add some unit tests. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7412da2e122d9274341ef840c6918409bc523b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b7412da2e122d9274341ef840c6918409bc523b3 commit b7412da2e122d9274341ef840c6918409bc523b3 Author: Dag-Erling Smørgrav AuthorDate: 2023-06-15 19:23:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-06-15 19:24:59 +0000 asa: Add some unit tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40564 --- etc/mtree/BSD.tests.dist | 2 + usr.bin/asa/Makefile | 5 ++- usr.bin/asa/tests/Makefile | 4 ++ usr.bin/asa/tests/asa_test.sh | 99 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8b9d0ac6bccd..d23ea1ac5b03 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -902,6 +902,8 @@ usr.bin apply .. + asa + .. awk bugs-fixed .. diff --git a/usr.bin/asa/Makefile b/usr.bin/asa/Makefile index c2a221ae027b..a29db0f31781 100644 --- a/usr.bin/asa/Makefile +++ b/usr.bin/asa/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 1995/03/25 18:04:51 glass Exp $ -# $FreeBSD$ +.include PROG= asa +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/usr.bin/asa/tests/Makefile b/usr.bin/asa/tests/Makefile new file mode 100644 index 000000000000..c8c0cde1b3a2 --- /dev/null +++ b/usr.bin/asa/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= asa_test + +.include diff --git a/usr.bin/asa/tests/asa_test.sh b/usr.bin/asa/tests/asa_test.sh new file mode 100644 index 000000000000..429342d530e4 --- /dev/null +++ b/usr.bin/asa/tests/asa_test.sh @@ -0,0 +1,99 @@ +# +# Copyright (c) 2023 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +a="The magic words are" +b="Squeamish Ossifrage" + +atf_check_asa() { + atf_check -o file:"$2" asa "$1" + atf_check -o file:"$2" asa <"$1" + atf_check -o file:"$2" asa - <"$1" +} + +atf_test_case space +space_head() { + atf_set descr "First character on line is ' '" +} +space_body() { + printf " %s\n %s\n" "$a" "$b" >infile + printf "%s\n%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case zero +zero_head() { + atf_set descr "First character on line is '0'" +} +zero_body() { + printf " %s\n0%s\n" "$a" "$b" >infile + printf "%s\n\n%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case one +one_head() { + atf_set descr "First character on line is '1'" +} +one_body() { + printf " %s\n1%s\n" "$a" "$b" >infile + printf "%s\f%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case plus +plus_head() { + atf_set descr "First character on line is '+'" +} +plus_body() { + printf " %s\n+%s\n" "$a" "$b" >infile + printf "%s\r%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case plus_top +plus_top_head() { + atf_set descr "First character in input is '+'" +} +plus_top_body() { + printf "+%s\n+%s\n" "$a" "$b" >infile + printf "%s\r%s\n" "$a" "$b" >outfile + atf_check_asa infile outfile +} + +atf_test_case stdout +stdout_head() { + atf_set descr "Failure to write to stdout" +} +stdout_body() { + ( + trap "" PIPE + echo " $a $b" | asa 2>stderr + echo $? >result + ) | true + atf_check -o inline:"1\n" cat result + atf_check -o match:"stdout" cat stderr +} + +atf_test_case dashdash +dashdash_head() { + atf_set descr "Use -- to end options" +} +dashdash_body() { + echo " $a $b" >-infile + atf_check -s not-exit:0 -e match:"illegal option" asa -infile + atf_check -o inline:"$a $b\n" asa -- -infile +} + +atf_init_test_cases() +{ + atf_add_test_case space + atf_add_test_case zero + atf_add_test_case one + atf_add_test_case plus + atf_add_test_case plus_top + atf_add_test_case stdout + atf_add_test_case dashdash +}