Date: Sun, 26 Jul 2026 09:45:08 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 7a62840e9c5a - stable/15 - bc: Fix tests Message-ID: <6a65d724.188d2.72f48451@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7a62840e9c5a5a30c6234c9186326ca2f05b4102 commit 7a62840e9c5a5a30c6234c9186326ca2f05b4102 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2026-04-29 15:14:13 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-07-25 17:16:15 +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 (cherry picked from commit 67a63eae7b2d10d29983c9698894f1bfff4ffc6e) --- 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 f1860e236089..161ba2c2d529 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -303,6 +303,10 @@ check_epoch_and_opts # Date Rev Description +# 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 + # 20220326 fbc002cb72d2 move from bcmp.c to bcmp.S if [ "$MACHINE_ARCH" = "amd64" ]; then clean_dep lib/libc bcmp c 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 <bsd.test.mk> 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 dchome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a65d724.188d2.72f48451>