mirror of
https://github.com/neovim/neovim.git
synced 2024-09-17 20:58:20 -04:00
Don't require busted.
Only provide the unittest target if busted was found. And only build nvim-test if the unittest target exists by excluding nvim-test from all. Note: this means nvim-test won't be built by default, but it will be built when you try to run unittests.
This commit is contained in:
parent
9a277a612f
commit
7bd4d68d93
@ -88,18 +88,20 @@ if(NOT BUSTED_OUTPUT_TYPE)
|
||||
set(BUSTED_OUTPUT_TYPE "utf_terminal")
|
||||
endif()
|
||||
|
||||
get_target_property(NVIM_TEST_LIB nvim-test LOCATION)
|
||||
add_custom_target(unittest
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-DBUSTED_PRG=${BUSTED_PRG}
|
||||
-DLUAJIT_PRG=${LUAJIT_PRG}
|
||||
-DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
||||
-DNVIM_TEST_LIB=${NVIM_TEST_LIB}
|
||||
-DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
|
||||
-DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
|
||||
-DTEST_INCLUDES=${CMAKE_BINARY_DIR}/test/includes/post
|
||||
-P ${CMAKE_MODULE_PATH}/RunUnittests.cmake
|
||||
DEPENDS nvim-test unittest-headers)
|
||||
if(BUSTED_PRG)
|
||||
get_target_property(NVIM_TEST_LIB nvim-test LOCATION)
|
||||
add_custom_target(unittest
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-DBUSTED_PRG=${BUSTED_PRG}
|
||||
-DLUAJIT_PRG=${LUAJIT_PRG}
|
||||
-DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
||||
-DNVIM_TEST_LIB=${NVIM_TEST_LIB}
|
||||
-DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
|
||||
-DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
|
||||
-DTEST_INCLUDES=${CMAKE_BINARY_DIR}/test/includes/post
|
||||
-P ${CMAKE_MODULE_PATH}/RunUnittests.cmake
|
||||
DEPENDS nvim-test unittest-headers)
|
||||
endif()
|
||||
|
||||
# Unfortunately, the below does not work under Ninja. Ninja doesn't use a
|
||||
# pseudo-tty when launching processes, because it can put many jobs in parallel
|
||||
|
@ -55,8 +55,8 @@ if(NOT DEFINED ENV{SKIP_EXEC})
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED ENV{SKIP_UNITTEST})
|
||||
add_library(nvim-test MODULE ${NEOVIM_SOURCES} ${OS_SOURCES})
|
||||
target_link_libraries (nvim-test ${NVIM_LINK_LIBRARIES})
|
||||
add_library(nvim-test MODULE EXCLUDE_FROM_ALL ${NEOVIM_SOURCES} ${OS_SOURCES})
|
||||
target_link_libraries(nvim-test ${NVIM_LINK_LIBRARIES})
|
||||
endif()
|
||||
|
||||
include_directories ("${PROJECT_SOURCE_DIR}/src/proto")
|
||||
include_directories("${PROJECT_SOURCE_DIR}/src/proto")
|
||||
|
Loading…
Reference in New Issue
Block a user