mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Fix unit tests
Apparently busted 1.11.0 is broken(https://github.com/Olivine-Labs/busted/issues/236) in a way that is causing the unit tests to fail. This pins the version to 1.10.0 and also fixes a wrong variable set when msgpack was added as a dependency
This commit is contained in:
parent
ed73da9f0e
commit
78fd9386b6
@ -135,7 +135,7 @@ if(BUSTED_PRG)
|
||||
add_custom_target(unittest
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-DBUSTED_PRG=${BUSTED_PRG}
|
||||
-DLUAJIT_PRG=${LUAJIT_PRG}
|
||||
-DLUA_PRG=${LUA_PRG}
|
||||
-DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
||||
-DNVIM_TEST_LIB=${NVIM_TEST_LIB}
|
||||
-DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
|
||||
|
@ -4,8 +4,7 @@ set(ENV{NVIM_TEST_LIB} ${NVIM_TEST_LIB})
|
||||
set(ENV{TEST_INCLUDES} ${TEST_INCLUDES})
|
||||
|
||||
execute_process(
|
||||
COMMAND ${BUSTED_PRG} -l ${LUAJIT_PRG} -o ${BUSTED_OUTPUT_TYPE}
|
||||
--pattern=.moon ${TEST_DIR}
|
||||
COMMAND ${BUSTED_PRG} -o ${BUSTED_OUTPUT_TYPE} --pattern=.moon ${TEST_DIR}
|
||||
WORKING_DIRECTORY ${WORKING_DIR}
|
||||
RESULT_VARIABLE res)
|
||||
|
||||
|
2
third-party/CMakeLists.txt
vendored
2
third-party/CMakeLists.txt
vendored
@ -158,7 +158,7 @@ if(USE_BUNDLED_LUAROCKS)
|
||||
# instances running in parallel. So we depend on moonscript to force it
|
||||
# to be serialized.
|
||||
add_custom_command(OUTPUT ${DEPS_BIN_DIR}/busted
|
||||
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install busted
|
||||
COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install busted 1.10.0
|
||||
--server=http://rocks.moonscript.org
|
||||
DEPENDS moonscript)
|
||||
add_custom_target(busted
|
||||
|
Loading…
Reference in New Issue
Block a user