From nobody Thu Aug 14 16:03:15 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 4c2qlm1xfNz64g6p; Thu, 14 Aug 2025 16:03:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2qll4nBXz3KHn; Thu, 14 Aug 2025 16:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755187395; 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=K2MPD+dYVkoaPtrxBpivmFhS0yBn20MHsQurwo6nux8=; b=PTkS/7dlEZdKTJcyH8eP8UGZHTxjUAAoGAVZsnh6hutDvaSxTkjs+rqxCramRtk1D9endt cakl4WVBxeL4TtZYdTCDSFe+LAFmu/U2+CnBVXF6CBb4muUjU46x4mzozmS3c4yUEiDc+K BmlZv/e1ZH2fPUv/xtHfnGrGrrrlcJtwfFREcqepezM94JwgDdbBokCGYYkIVHb0Zt2H01 ZywwURKdxFUijxhCbxvVNUl0D92q+P9g6I+9IXmhAK+F25FnunVFbhtGiumvWO1FlbGTFt IZ85jElVBSvPNzV7VK39d4aZKlEZY7XtI1om0Q0oRAjZCD1oROQDY7SLjp/JFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755187395; 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=K2MPD+dYVkoaPtrxBpivmFhS0yBn20MHsQurwo6nux8=; b=knGEzqVeMfTiGGAhjrX/OhwpiQ3+eNGDXntxuQVwjdGOmWmyfVJFPbAg93y8bJxBYxftr2 PBWAWJFOKkwwZMDpmOrZYvZxpbs8BNgMEm3niZYJYEELcQC1pPxvyEGqaPj2Q7pfogdriZ cLfVLabFXpSAUTDNSbq1hJ5fEuh1XKxnqxc3G1vl/wc9NpEr3Low/A5Q50kqjstwK8wRlF wLgN75+IftU3GN11V9GV4iwHL4/gv4Q9sWy2/26zpcT63f93bB1kWl+39iGvt5/tYn7hKQ 7uTNSJOaKXak/9M9iV4VX6RJFP9Witiq/CmF42Myvl74VaMzesrw/dR1Zuw0Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755187395; a=rsa-sha256; cv=none; b=nwBD+Z8CUzit7kB3QCjT9/oztBxObZ2i9Cxv4Boy+VXpAtIIfwEY5V6s71qcX5I1dZ99kt rf8GLlovKPPKRAb1ZYTjAXWjtqU3DduPxXWJ5G5SzdQWE8XsILqvyTjpEcWX7QkxyDddad 5CGnFmaZHVTYGLj+D1OWuV1cEw3SnoLJNZB1VSVomu8sItEbtgFS7i/mTN4buFKahU0F/D cl/fEKa9wwyUpjMLN6vltT5H4W82gFMemIZhsPc4xkJgVsdp4QzQzAC7gMa1q6hMI+cdE3 wqD7zh3le4Ksj6/h1Gztlb+OZ4QYMi2lhmiYWHoW9JRtEG0umYw9uJvoawsG/Q== 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 4c2qll3Kbyz10XM; Thu, 14 Aug 2025 16:03:15 +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 57EG3FwW080021; Thu, 14 Aug 2025 16:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57EG3FP0080017; Thu, 14 Aug 2025 16:03:15 GMT (envelope-from git) Date: Thu, 14 Aug 2025 16:03:15 GMT Message-Id: <202508141603.57EG3FP0080017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9bdd39b9fe52 - stable/14 - indent: Simplify test script 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9bdd39b9fe52c3fb9f7d2ec9322138defb01afcc Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9bdd39b9fe52c3fb9f7d2ec9322138defb01afcc commit 9bdd39b9fe52c3fb9f7d2ec9322138defb01afcc Author: Dag-Erling Smørgrav AuthorDate: 2025-08-07 23:33:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-14 14:00:09 +0000 indent: Simplify test script Much of the test script was concerned with working around RCS tags and dealing with cases which don't apply to indent. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51795 (cherry picked from commit 0ecc679fd3da0720d6ba331ebcceca8e0760fa22) --- usr.bin/indent/tests/functional_test.sh | 55 +++++++++------------------------ 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/usr.bin/indent/tests/functional_test.sh b/usr.bin/indent/tests/functional_test.sh index 44538e5b6e12..3f4431038234 100755 --- a/usr.bin/indent/tests/functional_test.sh +++ b/usr.bin/indent/tests/functional_test.sh @@ -1,3 +1,5 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause # # Copyright 2016 Dell EMC # All rights reserved. @@ -29,61 +31,34 @@ SRCDIR=$(atf_get_srcdir) check() { - local tc=${1}; shift - - local indent=$(atf_config_get usr.bin.indent.test_indent /usr/bin/indent) - - # All of the files need to be in the ATF sandbox in order for the tests - # to pass. - atf_check cp ${SRCDIR}/${tc}* . + local tc=${1} + local profile_flag - # Remove $FreeBSD$ RCS expansions because they get re-indented, which - # changes the output - local out_file="${tc}.stdout" - if [ -f "${out_file}" ]; then - parsed_file=output_file.parsed + cp "${SRCDIR}/${tc%.[0-9]}".* . - atf_check -o save:$parsed_file sed -e '/\$FreeBSD.*\$/d' \ - ${tc}.stdout - out_flag="-o file:$parsed_file" - fi - local profile_file="${tc}.pro" - if [ -f "${profile_file}" ]; then - profile_flag="-P${profile_file}" + if [ -f "${tc}.pro" ]; then + profile_flag="-P${tc}.pro" else # Make sure we don't implicitly use ~/.indent.pro from the test # host, for determinism purposes. profile_flag="-npro" fi - sed -e '/\$FreeBSD.*\$/d' ${tc} > input_file.parsed - atf_check -s exit:${tc##*.} ${out_flag} ${indent} ${profile_flag} < input_file.parsed + atf_check -s exit:${tc##*.} -o file:"${tc}.stdout" \ + indent ${profile_flag} < "${tc}" } -add_testcase() +add_legacy_testcase() { local tc=${1} - local tc_escaped word - - case "${tc%.*}" in - *-*) - local IFS="-" - for word in ${tc%.*}; do - tc_escaped="${tc_escaped:+${tc_escaped}_}${word}" - done - ;; - *) - tc_escaped=${tc%.*} - ;; - esac - atf_test_case ${tc_escaped} - eval "${tc_escaped}_body() { check ${tc}; }" - atf_add_test_case ${tc_escaped} + atf_test_case ${tc%.[0-9]} + eval "${tc%.[0-9]}_body() { check ${tc}; }" + atf_add_test_case ${tc%.[0-9]} } atf_init_test_cases() { - for path in $(find -Es "${SRCDIR}" -regex '.*\.[0-9]+$'); do - add_testcase ${path##*/} + for tc in $(find -s "${SRCDIR}" -name '*.[0-9]'); do + add_legacy_testcase "${tc##*/}" done }