From 50b1df57c4af912ec8950152a17ed3fe2173fb2e Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Wed, 25 May 2022 01:33:07 +0100 Subject: [PATCH] tests.sh: more windows weirdness --- tests.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests.sh b/tests.sh index 4672d13..bf902e5 100755 --- a/tests.sh +++ b/tests.sh @@ -34,9 +34,8 @@ luarocks_root="${PWD}/.luarocks"; # eval "$(luarocks --tree "${luarocks_root}" path)"; PATH="$(luarocks --tree "${luarocks_root}" path --lr-bin):${PATH}"; -echo "PATH | ${PATH}"; -LUA_PATH="$(luarocks --tree "${luarocks_root}" path --lr-path);init.lua;./?.lua"; -LUA_CPATH="$(luarocks --tree "${luarocks_root}" path --lr-cpath);./?.so"; +LUA_PATH="$(luarocks --tree "${luarocks_root}" path --lr-path);init.lua;./?.lua;${LUA_PATH}"; +LUA_CPATH="$(luarocks --tree "${luarocks_root}" path --lr-cpath);./?.so;${LUA_CPATH}"; export PATH LUA_PATH LUA_CPATH; @@ -54,7 +53,15 @@ run_syntax_check() { } run_test() { - .luarocks/bin/busted --no-auto-insulate --pattern ".test.lua" .tests; + busted_path=".luarocks/bin/busted"; + if [[ ! -r "${busted_path}" ]]; then + busted_path=".luarocks/bin/busted.bat"; + fi + if [[ ! -r "${busted_path}" ]]; then + echo "Error: Failed to find busted at .luarocks/bin/busted or .luarocks/bin/busted.bat" >&2; + exit 1; + fi + "${busted_path}" --no-auto-insulate --pattern ".test.lua" .tests; } case "${mode}" in @@ -70,10 +77,6 @@ case "${mode}" in run_test; ;; - busted ) - .luarocks/bin/busted "${@}"; - ;; - * ) echo -e "Usage: path/to/run.sh setup # Setup to run the tests