From nobody Wed Apr 29 15:15:45 2026 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 4g5LTs1xjRz6bmYp for ; Wed, 29 Apr 2026 15:15:45 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5LTs1QC3z3W3S for ; Wed, 29 Apr 2026 15:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777475745; 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=9+BCICBN/5j7bFZfs1XVow/wJhwmZU+Sq7kSNX4I55A=; b=Dd9hoiSRVXoJJsHfZLYlMYOO5i81h7NyG03+DvVGBvJlgfhOMezbqqJKPLhpnrjO4fdmsN PUlgRkNgeGTneYkiuINbKekUY5FdkcnhmVUbGucJOt32fUBvqM+VM7HahMvcAVf7WdVKHv L7MdPtmWJdl8wjDGrb0FXcfzW8WukKgAX83lVd4c1sYlrySFniIXf0uzUwBCLoUM+aLzpR 5si0PJZBGXE02PwyjRnVRr6XjqiMzEm3REw7evvDdROumHkjmbn3W3OTmpQ7MsvKPc0OFq CtDawv1mMqb92oaXB1YWKiw+E1TPH6u0axdXhxHN4zskMn72c3BzBEOmbu6X3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777475745; a=rsa-sha256; cv=none; b=YDB1Phe1oGn2K3K16WvEt7oWR17Dr2ZveXizm+oDtSfKM55a4dQLMJ1nJleWDcJGGQnvQR FSitleH104TJ5oFcF2bOFfPW2cwcWDWLhJauT3vO+8yfSCae2hshkZqIgoM1k9jCQEpfSF qzVCkvp+wYH6vs0/Czm7KA3soEpUaZ7zMqLhU6ANYh6484MfiY0R3VpT8T9d6SMvoJ7DOG fdT6kyLW3zEuZcAAwWNa1iXPzHtGCdlriStRhn2vzyXvSH6zVn1Nx+7xwIceoZTc5Ygmp9 37j9YtsoHhFdIzA8kt/WlvAM9GCsSsiUKjURgnljijXiO0t0tOMTAuep/8n9lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777475745; 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=9+BCICBN/5j7bFZfs1XVow/wJhwmZU+Sq7kSNX4I55A=; b=r/j/dqNTRGn4L6u9epZCAFajh28aXzp+I9UTFIyo+SaQNuGbt9IaButk1IE+K/3zRbYX+j xON8+rEIt9VHnM2BZHhVfKuvHitzvVdvYcFX8PkSAAif0iAbq1/Q+Y5Zps9Jr1CZoDLQ7D HV1pUoNbPYuWJm5wHeVJR46ReXdxZ7+iJeXIXa2KspLOmX/oK6KDV1hzv0bqEz+z/5cNRQ lt1y+SFJxZ6gHyGly6lnTKpt9/xD+YkfyIu/ybDh6PlBuVgNaYz6mDbiqF2BUVWSdu4r8B dS9iSrr/4iQJONhJP8xsefExor99RN7ynK1xhv1b3RWxaYa5bcJ2VhWOq9gjpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5LTs11PDzlkm for ; Wed, 29 Apr 2026 15:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fa11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 15:15:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 67a63eae7b2d - main - bc: Fix 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 67a63eae7b2d10d29983c9698894f1bfff4ffc6e Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 15:15:45 +0000 Message-Id: <69f220a1.3fa11.638c57af@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=67a63eae7b2d10d29983c9698894f1bfff4ffc6e commit 67a63eae7b2d10d29983c9698894f1bfff4ffc6e Author: Dag-Erling Smørgrav AuthorDate: 2026-04-29 15:14:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-29 15:15:30 +0000 bc: Fix tests Stop generating test scripts at build time. The dc test script is broken and simply fixing the code that generates it won't help as there is no reliable way to ensure it gets regenerated if it already exists in the object tree. MFC after: 1 week Reviewed by: se Differential Revision: https://reviews.freebsd.org/D56511 --- tools/build/depend-cleanup.sh | 4 ++++ usr.bin/gh-bc/tests/Makefile | 10 ---------- usr.bin/gh-bc/tests/bc_tests.sh | 5 +++++ usr.bin/gh-bc/tests/dc_tests.sh | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 1c9b7ea8c3b3..b72dd3b60f05 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -317,6 +317,10 @@ check_epoch_and_opts # "$OBJTOP"/tests/sys/kqueue/libkqueue/* #fi +# 20260427 # bc / dc test scripts no longer generated +dir="${OBJTOP%/}"/usr.bin/gh-bc/tests +run rm -fv "${dir}"/bc_tests.sh "${dir}"/dc_tests.sh + # 20260426 # libpkgconf contains incorrect paths clean_obj lib/libpkgconf personality c pkgconfig:/share clean_obj lib/libpkgconf pkg c pkgconfig:/share diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile index f2c92aecb0a5..6c3098350c58 100644 --- a/usr.bin/gh-bc/tests/Makefile +++ b/usr.bin/gh-bc/tests/Makefile @@ -55,14 +55,4 @@ FILESdc_scriptsMODE= 0755 PLAIN_TESTS_SH= bc_tests dc_tests -bc_tests.sh: - echo "#!/bin/sh" > ${.TARGET} - echo 'env LANG=C BC_TEST_OUTPUT_DIR=$$(pwd) \ - ${TESTSDIR}/tests/all.sh -n bc 1 1 0 0 bc' >> ${.TARGET} - -dc_tests.sh: - echo "#!/bin/sh" > ${.TARGET} - echo "env LANG=C BC_TEST_OUTPUT_DIR=\$pwd \ - ${TESTSDIR}/tests/all.sh -n dc 1 1 0 0 dc" >> ${.TARGET} - .include diff --git a/usr.bin/gh-bc/tests/bc_tests.sh b/usr.bin/gh-bc/tests/bc_tests.sh new file mode 100755 index 000000000000..76cfee05560f --- /dev/null +++ b/usr.bin/gh-bc/tests/bc_tests.sh @@ -0,0 +1,5 @@ +#!/bin/sh +unset LC_ALL LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME +export LANG=C +export BC_TEST_OUTPUT_DIR=${PWD} +exec "$(dirname "$(realpath "$0")")"/tests/all.sh -n bc 1 1 0 0 bc diff --git a/usr.bin/gh-bc/tests/dc_tests.sh b/usr.bin/gh-bc/tests/dc_tests.sh new file mode 100755 index 000000000000..6900ce9098d0 --- /dev/null +++ b/usr.bin/gh-bc/tests/dc_tests.sh @@ -0,0 +1,5 @@ +#!/bin/sh +unset LC_ALL LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME +export LANG=C +export BC_TEST_OUTPUT_DIR=${PWD} +exec "$(dirname "$(realpath "$0")")"/tests/all.sh -n dc 1 1 0 0 dc