From e25835817065ba51f2ed5fb84b511653d540bbaf Mon Sep 17 00:00:00 2001 From: Lee Read Date: Fri, 26 Jul 2024 06:56:47 -0400 Subject: [PATCH] Support running of new babashka.process tests (#1711) Default `BABASHKA_TEST_ENV` to `jvm` for libtests CI already understands this need, but defaulting in-script avoids having devs to understand/remember it too. Alter PATH as required for new babashka.process tests. In support of babashka/process#163, babashka/process#164 --- script/lib_tests/run_all_libtests | 6 ++++++ script/lib_tests/run_all_libtests.bat | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/script/lib_tests/run_all_libtests b/script/lib_tests/run_all_libtests index a5409d57..dac86d29 100755 --- a/script/lib_tests/run_all_libtests +++ b/script/lib_tests/run_all_libtests @@ -2,12 +2,18 @@ set -eo pipefail +: "${BABASHKA_TEST_ENV:=jvm}" +export BABASHKA_TEST_ENV + if [ "$BABASHKA_TEST_ENV" = "native" ]; then BB_CMD="./bb" else BB_CMD="lein bb" fi +export PATH +PATH=$(pwd)/process/target/test/on-path:$PATH + export BABASHKA_CLASSPATH BABASHKA_CLASSPATH=$(clojure -Spath -A:lib-tests) diff --git a/script/lib_tests/run_all_libtests.bat b/script/lib_tests/run_all_libtests.bat index 6c36ba62..f1915b56 100644 --- a/script/lib_tests/run_all_libtests.bat +++ b/script/lib_tests/run_all_libtests.bat @@ -1,7 +1,11 @@ +if not defined BABASHKA_TEST_ENV set BABASHKA_TEST_ENV=jvm + if "%BABASHKA_TEST_ENV%" EQU "native" (set BB_CMD=.\bb) else (set BB_CMD=lein bb) set EDN=lib_tests.edn +set PATH=%CD%\process\target\test\on-path;%PATH% + .\bb -f script/lib_tests/bb_edn_from_deps.clj %EDN% %BB_CMD% --config %EDN% --deps-root . -f test-resources/lib_tests/babashka/run_all_libtests.clj %*