From nobody Sat May 27 18:11:54 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 4QT8y23byqz4V6rB; Sat, 27 May 2023 18:11:54 +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 4QT8y239S8z43nC; Sat, 27 May 2023 18:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685211114; 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=3LPGCLFFQnyJQzJ4xtNm53xzhsnuU2p93pRxaBCjdV8=; b=fLqkIdpqjXRl3yBvNLFAUsw4FGfU+Vp0rpzd/47NqxT/1vSaqVmVL2L0Wl9yDdcJWSEGVw tSdviGQ49RPkzQuOrjkjCYcL6hO5my599+1JO45nMV29eOzIeCVHje0ySYgN8T9mxZQtzA HdLcMcTpX/Pm8W8uRgniFYVpL51M8tbddiVAwI+yOZbAhB732P2MxukBR6zySp3wlJ0wG9 FdCiym5tG/4NUSvL7UPGWpjzXU7zAzEdzGKheNoE89UQ+ktMmjz/WAQLQt1CQ0qA0oHSch NJO0rJkA7oxgtQtSyVp1+yn05FN3Ed0E7ixvnrNbdkiQWNv5IvkoAPnG2+qxEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685211114; 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=3LPGCLFFQnyJQzJ4xtNm53xzhsnuU2p93pRxaBCjdV8=; b=Z/kudn/kJSP3KiGcAN9skm9cOqObcpUdZ+bOQVlhT2BlMWp0+jersvHMp/ikGasoGQQOHi EA3UfomwyZwcbHx8k/CFC0SNpkJfdvbR5hUqbpUmvp7TRGp+T4iNnllmA1Erd8sFToUbfD +0P1kjUSnYJIBzXH2LoSnpU3e3RR0bh9pGolyC+od+W9cGE84XPP8VYSx68636ELmwdUXn KkOccds/ACRd8zvolaK5i2uCybP2p98RKeACx4KsOMdXQH11sj2KqTzqX7xCoL2JyzNWRR WjqndRo7o6a6kYvMX1glLb/6TAsScVB1rkqAPXFlVqrzuRfnsQwjfr3DjXbHiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685211114; a=rsa-sha256; cv=none; b=HSYZM5xBnhz8vtfJFkVc0d8vPTkQ1dQ2OrMkGcC5kteUpBaL7xr4zoRsD5NGhboOZVru0N n63Ko/QXaHUBKnBG+zgAXtrkWVkhUXHy4M0CauCQXCzBbM5W6xyA/L0Whu4VUfr09FEqUE L0M7WhzFlzmGgJskolUiFrkXKlouQSRnpY51BaNutZ97HxQXCjCWfL4rcgkxlR4aCUbYMU tHrjkfcUGqgiGTLRxPla8vV1h/kP2gr35aYU0uiYwoGwenyCibj6hlGWe3wciKVhl8TIPV P22oU71xDwzb54/v+pVpJz7ZOtHZ8t1xJz5jYqKtjf1y4FqXHCQ2Vq5bNsT4oA== 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 4QT8y22DnMzyWq; Sat, 27 May 2023 18:11:54 +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 34RIBsm8093513; Sat, 27 May 2023 18:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34RIBs6U093512; Sat, 27 May 2023 18:11:54 GMT (envelope-from git) Date: Sat, 27 May 2023 18:11:54 GMT Message-Id: <202305271811.34RIBs6U093512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: c60be9ea6b1e - main - Add simple factor/primes regression tests 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c60be9ea6b1ecef6e77096601660f9573ec59a26 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c60be9ea6b1ecef6e77096601660f9573ec59a26 commit c60be9ea6b1ecef6e77096601660f9573ec59a26 Author: Enji Cooper AuthorDate: 2023-05-27 04:51:24 +0000 Commit: Enji Cooper CommitDate: 2023-05-27 18:11:44 +0000 Add simple factor/primes regression tests This will help ensure that the change following this one to support OpenSSL 3 is sane. MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40297 --- etc/mtree/BSD.tests.dist | 2 + usr.bin/factor/Makefile | 3 ++ usr.bin/factor/tests/Makefile | 4 ++ usr.bin/factor/tests/factor_tests.sh | 85 ++++++++++++++++++++++++++++++++++++ usr.bin/factor/tests/primes_tests.sh | 75 +++++++++++++++++++++++++++++++ 5 files changed, 169 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 77c07960f938..8dc52086fe33 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1036,6 +1036,8 @@ .. du .. + factor + .. file2c .. file diff --git a/usr.bin/factor/Makefile b/usr.bin/factor/Makefile index f180c0f135e7..255160ef6e00 100644 --- a/usr.bin/factor/Makefile +++ b/usr.bin/factor/Makefile @@ -17,4 +17,7 @@ MAN= factor.6 MLINKS+=factor.6 primes.6 .PATH: ${SRCTOP}/usr.bin/primes +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.bin/factor/tests/Makefile b/usr.bin/factor/tests/Makefile new file mode 100644 index 000000000000..f9b13443ae92 --- /dev/null +++ b/usr.bin/factor/tests/Makefile @@ -0,0 +1,4 @@ +ATF_TESTS_SH+= factor_tests +ATF_TESTS_SH+= primes_tests + +.include diff --git a/usr.bin/factor/tests/factor_tests.sh b/usr.bin/factor/tests/factor_tests.sh new file mode 100755 index 000000000000..0d9156673582 --- /dev/null +++ b/usr.bin/factor/tests/factor_tests.sh @@ -0,0 +1,85 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright 2023 (C) Enji Cooper +# +# 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 float_non_prime +float_non_prime_head() +{ + atf_set "descr" "Test with a float non-prime number" +} +float_non_prime_body() +{ + atf_check -o inline:"1: 1\n" factor 1.44 +} + +atf_test_case float_prime +float_prime_head() +{ + atf_set "descr" "Test with a float prime number" +} +float_prime_body() +{ + pi="3.141592653589793238462643383279502884197" + atf_check -o inline:"3: 3\n" factor $pi +} + +atf_test_case int_non_prime +int_non_prime_head() +{ + atf_set "descr" "Test with an integral prime number" +} +int_non_prime_body() +{ + atf_check -o inline:"8: 2 2 2\n" factor 8 +} + +atf_test_case int_prime +int_prime_head() +{ + atf_set "descr" "Test with an integral prime number" +} +int_prime_body() +{ + atf_check -o inline:"31: 31\n" factor 31 +} + +atf_test_case negative_numbers_not_allowed +negative_numbers_not_allowed_head() +{ + atf_set "descr" "Verify that negative numbers are not allowed." +} +negative_numbers_not_allowed_body() +{ + atf_check -s not-exit:0 -e inline:"factor: negative numbers aren't permitted.\n" factor -- -4 +} + +atf_init_test_cases() +{ + atf_add_test_case float_non_prime + atf_add_test_case float_prime + atf_add_test_case int_non_prime + atf_add_test_case int_prime + atf_add_test_case negative_numbers_not_allowed +} diff --git a/usr.bin/factor/tests/primes_tests.sh b/usr.bin/factor/tests/primes_tests.sh new file mode 100755 index 000000000000..2b00e9ba34c8 --- /dev/null +++ b/usr.bin/factor/tests/primes_tests.sh @@ -0,0 +1,75 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright 2023 (C) Enji Cooper +# +# 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 invalid_range +invalid_range_head() +{ + atf_set "descr" "Verify that invalid ranges are not allowed." +} +invalid_range_body() +{ + atf_check -s not-exit:0 -e inline:"primes: start value must be less than stop value.\n" primes -- 2 1 +} + +atf_test_case negative_numbers_not_allowed +negative_numbers_not_allowed_head() +{ + atf_set "descr" "Verify that negative numbers are not allowed." +} +negative_numbers_not_allowed_body() +{ + atf_check -s not-exit:0 -e inline:"primes: negative numbers aren't permitted.\n" primes -- -1 0 +} + +atf_test_case no_primes_between_between_20_and_22 +no_primes_between_between_20_and_22_head() +{ + atf_set "descr" "Show that no primes exist between [20, 22]." +} + +no_primes_between_between_20_and_22_body() +{ + atf_check primes 20 22 +} + +atf_test_case primes_in_20_to_50_range +primes_in_20_to_50_range_head() +{ + atf_set "descr" "Find all primes between [20, 50]." +} + +primes_in_20_to_50_range_body() +{ + atf_check -o inline:"23\n29\n31\n37\n41\n43\n47\n" primes 20 50 +} + +atf_init_test_cases() +{ + atf_add_test_case invalid_range + atf_add_test_case negative_numbers_not_allowed + atf_add_test_case no_primes_between_between_20_and_22 + atf_add_test_case primes_in_20_to_50_range +}