mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 20:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't require busted.

Browse Source 
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:
John Szakmeister
2014-03-22 07:14:55 -04:00
parent 9a277a612f
commit 7bd4d68d93
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@@ -88,18 +88,20 @@ if(NOT BUSTED_OUTPUT_TYPE)
set(BUSTED_OUTPUT_TYPE "utf_terminal") set(BUSTED_OUTPUT_TYPE "utf_terminal")
endif() endif()
get_target_property(NVIM_TEST_LIB nvim-test LOCATION) if(BUSTED_PRG)
add_custom_target(unittest get_target_property(NVIM_TEST_LIB nvim-test LOCATION)
COMMAND ${CMAKE_COMMAND} add_custom_target(unittest
-DBUSTED_PRG=${BUSTED_PRG} COMMAND ${CMAKE_COMMAND}
-DLUAJIT_PRG=${LUAJIT_PRG} -DBUSTED_PRG=${BUSTED_PRG}
-DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DLUAJIT_PRG=${LUAJIT_PRG}
-DNVIM_TEST_LIB=${NVIM_TEST_LIB} -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE} -DNVIM_TEST_LIB=${NVIM_TEST_LIB}
-DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
-DTEST_INCLUDES=${CMAKE_BINARY_DIR}/test/includes/post -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
-P ${CMAKE_MODULE_PATH}/RunUnittests.cmake -DTEST_INCLUDES=${CMAKE_BINARY_DIR}/test/includes/post
DEPENDS nvim-test unittest-headers) -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 # 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 # pseudo-tty when launching processes, because it can put many jobs in parallel

6
src/CMakeLists.txt
View File

@@ -55,8 +55,8 @@ if(NOT DEFINED ENV{SKIP_EXEC})
endif() endif()
if(NOT DEFINED ENV{SKIP_UNITTEST}) if(NOT DEFINED ENV{SKIP_UNITTEST})
add_library(nvim-test MODULE ${NEOVIM_SOURCES} ${OS_SOURCES}) add_library(nvim-test MODULE EXCLUDE_FROM_ALL ${NEOVIM_SOURCES} ${OS_SOURCES})
target_link_libraries (nvim-test ${NVIM_LINK_LIBRARIES}) target_link_libraries(nvim-test ${NVIM_LINK_LIBRARIES})
endif() endif()
include_directories ("${PROJECT_SOURCE_DIR}/src/proto") include_directories("${PROJECT_SOURCE_DIR}/src/proto")