aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-06-24 08:47:02 +0200
committerGitHub <noreply@github.com>2019-06-24 08:47:02 +0200
commit93297cfc6f2c4e8407d2884521397939a2e7081d (patch)
treef77b31683110523879bc0f2203213b1671d93429
parent69eb4fa0c5a4e8b039b177f556f57614b6acb422 (diff)
downloadrneovim-93297cfc6f2c4e8407d2884521397939a2e7081d.tar.gz
rneovim-93297cfc6f2c4e8407d2884521397939a2e7081d.tar.bz2
rneovim-93297cfc6f2c4e8407d2884521397939a2e7081d.zip
tests: busted: do not use "--lua" (#10303)
The feature is very rudimentary [1], and causes problems when not using bundled deps, where it might then fail to find `busted.runner` due to this. E.g. with "-DUSE_BUNDLED=OFF -DUSE_BUNDLED_LUAROCKS=ON": `.deps/usr/bin/busted` contains `exec '/usr/bin/luajit' -e …`, i.e. it run luajit with adjusted lpath etc. But using `--lua /usr/bin/luajit` then causes this `busted` wrapper to be replaced with just `/usr/bin/luajit`, i.e. it is missing the adjusted lpath then. 1: https://github.com/Olivine-Labs/busted/commit/9eb6c9cf93bc558a2398c822b896990e48bd69fd
-rw-r--r--cmake/RunTests.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake
index 0282d1c738..db67b14917 100644
--- a/cmake/RunTests.cmake
+++ b/cmake/RunTests.cmake
@@ -44,7 +44,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR})
set(ENV{SYSTEM_NAME} ${SYSTEM_NAME})
execute_process(
COMMAND ${BUSTED_PRG} -v -o ${BUSTED_OUTPUT_TYPE}
- --lua=${LUA_PRG} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
+ --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
--lpath=${BUILD_DIR}/?.lua
--lpath=${WORKING_DIR}/runtime/lua/?.lua
--lpath=?.lua