diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-14 16:46:16 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-14 16:46:16 -0300 |
| commit | 78fd9386b6c9fd5d335a95ee1d7c71395a4b903a (patch) | |
| tree | 95c923ba644e0523798e55549eb12095bcf83de9 | |
| parent | ed73da9f0ec532a38f74501985db4bd5c60e5b9d (diff) | |
| download | rneovim-78fd9386b6c9fd5d335a95ee1d7c71395a4b903a.tar.gz rneovim-78fd9386b6c9fd5d335a95ee1d7c71395a4b903a.tar.bz2 rneovim-78fd9386b6c9fd5d335a95ee1d7c71395a4b903a.zip | |
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
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/RunUnittests.cmake | 3 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bc344d4d4..4e88157c7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} diff --git a/cmake/RunUnittests.cmake b/cmake/RunUnittests.cmake index 8c1992e0bf..641a622f1e 100644 --- a/cmake/RunUnittests.cmake +++ b/cmake/RunUnittests.cmake @@ -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) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index f8895f6408..f9701e06c8 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -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 |