aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2023-02-10 20:51:36 +0100
committerGitHub <noreply@github.com>2023-02-10 20:51:36 +0100
commitb8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802 (patch)
treeea341bee19c2202cbe94ccefb2afeba953af713e /cmake
parent4c64cbe99f2616a1d1126257da8d40773f4adba1 (diff)
parent0837980db4958baca96449869d31120f349f3500 (diff)
downloadrneovim-b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802.tar.gz
rneovim-b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802.tar.bz2
rneovim-b8ad1bfe8bc23ed5ffbfe43df5fda3501f1d2802.zip
Merge pull request #22077 from bfredl/neolua_client
refactor(tests): integrate lua-client into core and use core for functionaltests
Diffstat (limited to 'cmake')
-rw-r--r--cmake/RunTests.cmake10
1 files changed, 2 insertions, 8 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake
index d724f43a5f..3ac15f91ea 100644
--- a/cmake/RunTests.cmake
+++ b/cmake/RunTests.cmake
@@ -71,16 +71,10 @@ if(NOT DEFINED ENV{TEST_TIMEOUT} OR "$ENV{TEST_TIMEOUT}" STREQUAL "")
endif()
set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME}) # used by test/helpers.lua.
-
-# TODO: eventually always use NVIM_PRG as the runner
-if("${TEST_TYPE}" STREQUAL "unit")
- set(RUNNER_PRG ${NVIM_PRG} -ll ${WORKING_DIR}/test/busted_runner.lua)
-else()
- set(RUNNER_PRG ${BUSTED_PRG})
-endif()
+set(ENV{DEPS_PREFIX} ${DEPS_PREFIX}) # used by test/busted_runner.lua on windows
execute_process(
- COMMAND ${RUNNER_PRG} -v -o test.busted.outputHandlers.${BUSTED_OUTPUT_TYPE}
+ COMMAND ${NVIM_PRG} -ll ${WORKING_DIR}/test/busted_runner.lua -v -o test.busted.outputHandlers.${BUSTED_OUTPUT_TYPE}
--lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
--lpath=${BUILD_DIR}/?.lua
--lpath=${WORKING_DIR}/runtime/lua/?.lua