diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-04-29 15:14:13 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-04-29 15:15:30 +0000 |
| commit | 67a63eae7b2d10d29983c9698894f1bfff4ffc6e (patch) | |
| tree | 850276ea7e86d67957ea7217a94536fd2ef5b705 | |
| parent | 4c99836ac72abb3ec64ee801ac5758ae70cf9a9b (diff) | |
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
| -rwxr-xr-x | tools/build/depend-cleanup.sh | 4 | ||||
| -rw-r--r-- | usr.bin/gh-bc/tests/Makefile | 10 | ||||
| -rwxr-xr-x | usr.bin/gh-bc/tests/bc_tests.sh | 5 | ||||
| -rwxr-xr-x | 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 <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 dc |