From nobody Wed Sep 24 05:35:13 2025 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 4cWlt95H3sz68Wmg; Wed, 24 Sep 2025 05:35:13 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWlt94R9hz3WF6; Wed, 24 Sep 2025 05:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758692113; 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=E+OM8+FtImdWBumcaYE0+HETqg4Fxz5f85D7htGLrOE=; b=k+mwAkVh9RFuklto/+BVwsOA/Dnwt2zScSrA7gcyZLR4xEfYUqX2jJRZ7l12XPc6q5iSmT IIQ5WD1wkeN/3PYvbhbPlxytzDEbkbCMhykRhWGIh0xjra8WYNVgUTOM74bfjR0wNmKSQQ FMUEmIs3jG5W7IcS6jgAYV1YwfL6SyPBBy5Z+iUn6zVJdQq1XclN2995xL+4ZmD5fxEiSG wqfOeUg0TVeKNWSHYIZNixs9hjPyhqFZHLF0qhXP0Z24i4962sZmUvF95rdkYMIlyszzHU gmdrkEWQ1EQfkZENL0JBGgJ6/DfH3yclBI76rCc6d0iCPh2qibpmD3+gZr+1UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758692113; 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=E+OM8+FtImdWBumcaYE0+HETqg4Fxz5f85D7htGLrOE=; b=U3zMbIeZG7pg6o4PVBjOhhplYNO2+46JJ2uDa5jFC8nJXMHkwzFoGpt2S0SjkgWs+hBQfR 3IN2KDSoJP4Xo0dF878xSm9Xhhz2SaJDS4glSyQZEYMfMGEy3jq7oeXjpxfWOS1VhDYeb4 +6rG/JvkOyCDwIx4AX3o2RqeIrJpzahLElm9qWIckLgSjQdCEKozvRPC6EdA4O6HuMtath fc7h9jbhrXAOPtctajVKIB7JL82xqhvEeNS5063c5e0J9lzKGC5t44p8tTUJw9+dLQC5E3 S9uk3et/PSO6Ow9EUY2mZ9Fn3S6kEwkBfAI2K29XSGcAC0CspBOQIWJbtYjrBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758692113; a=rsa-sha256; cv=none; b=H4Oo9h5x+42Bv87H2lLLGU1DltxMPLl7OzVreIC9tVw3ULGU6F/m+joIyPr3PtDK2YLad4 j30pgH0xWeT94fmBa7yimnS2v1TkbfNbz1A+23z1poCCLpI9uUnkXy5eUMg8hqmA8B+kaK y7jhEgls5wC/5G6IXSIfpg0Ju8pny/5Z0xV7NBPTsSuQ29+PaSlaXPh659CzA9Wu+n6Gse Avv8hoqeT1iVsf6UoGmLbIOgx8GqCywZgrzakGpIDD8O6MJzLi39upRLnl/3O11rFld6kU KNqXGXy9+X4v5q0kZUbahDhssLHU4CWH4LjkJrI3HpxXFyXaNdeNRvaapO6a+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWlt93qqBz3Rk; Wed, 24 Sep 2025 05:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58O5ZDnR086295; Wed, 24 Sep 2025 05:35:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O5ZD9V086292; Wed, 24 Sep 2025 05:35:13 GMT (envelope-from git) Date: Wed, 24 Sep 2025 05:35:13 GMT Message-Id: <202509240535.58O5ZD9V086292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: ebb9f371b4a3 - stable/13 - Add simple factor/primes regression 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ebb9f371b4a3b1218cd11b247e8d641eda923b2e Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=ebb9f371b4a3b1218cd11b247e8d641eda923b2e commit ebb9f371b4a3b1218cd11b247e8d641eda923b2e Author: Enji Cooper AuthorDate: 2023-05-27 04:51:24 +0000 Commit: Enji Cooper CommitDate: 2025-09-24 05:33:18 +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 (cherry picked from commit c60be9ea6b1ecef6e77096601660f9573ec59a26) --- 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 fa5c9e910049..bbd0862c226b 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1035,6 +1035,8 @@ .. env .. + factor + .. file2c .. file diff --git a/usr.bin/factor/Makefile b/usr.bin/factor/Makefile index fa36aaeef8b3..e2bb64b78a4e 100644 --- a/usr.bin/factor/Makefile +++ b/usr.bin/factor/Makefile @@ -15,4 +15,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 +}