diff --git a/contrib/bc/tests/all.sh b/contrib/bc/tests/all.sh --- a/contrib/bc/tests/all.sh +++ b/contrib/bc/tests/all.sh @@ -39,7 +39,7 @@ if [ $# -eq 1 ]; then printf '%s\n\n' "$1" fi - print 'usage: %s [-n] dir [run_extra_tests] [run_stack_tests] [gen_tests] [run_problematic_tests] [exec args...]\n' \ + printf 'usage: %s [-n] dir [run_extra_tests] [run_stack_tests] [gen_tests] [run_problematic_tests] [exec args...]\n' \ "$script" exit 1 } diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -317,6 +317,10 @@ # "$OBJTOP"/tests/sys/kqueue/libkqueue/* #fi +# 20250419 # bc / dc test scripts no longer generated +dir="${OBJTOP%/}"/usr.bin/gh-bc/tests +run rm -fv "${dir}"/[bd]c_tests "${dir}"/[bd]c_tests.sh + # 20251219 # libkrb5profile is now internal for libcompat in "" $ALL_libcompats; do dirprfx=${libcompat:+obj-lib${libcompat}} diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile --- a/usr.bin/gh-bc/tests/Makefile +++ b/usr.bin/gh-bc/tests/Makefile @@ -55,14 +55,4 @@ 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 --- /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 --- /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