IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Rename target "test" to "functionaltest".

Browse Source 
Remove build warning:

    The target name "test" is reserved or not valid for certain CMake
    features, such as generator expressions, and may result in undefined
    behavior.
This commit is contained in:
Florian Walch 2014-11-05 11:54:20 +01:00
parent 5714afc11e
commit b904c33e41
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -249,7 +249,7 @@ if(BUSTED_PRG)
-P ${CMAKE_MODULE_PATH}/RunTests.cmake -P ${CMAKE_MODULE_PATH}/RunTests.cmake
DEPENDS nvim-test unittest-headers) DEPENDS nvim-test unittest-headers)
add_custom_target(test add_custom_target(functionaltest
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DBUSTED_PRG=${BUSTED_PRG} -DBUSTED_PRG=${BUSTED_PRG}
-DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
@ -258,5 +258,5 @@ if(BUSTED_PRG)
-DBUILD_DIR=${CMAKE_BINARY_DIR} -DBUILD_DIR=${CMAKE_BINARY_DIR}
-DTEST_TYPE=functional -DTEST_TYPE=functional
-P ${CMAKE_MODULE_PATH}/RunTests.cmake -P ${CMAKE_MODULE_PATH}/RunTests.cmake
DEPENDS nvim) DEPENDS nvim)
endif() endif()

8
Makefile
View File

@ -77,8 +77,10 @@ endif
oldtest: | nvim oldtest: | nvim
+$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES) +$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
test: | nvim functionaltest: | nvim
+$(BUILD_CMD) -C build test +$(BUILD_CMD) -C build functionaltest
test: functionaltest
unittest: | nvim unittest: | nvim
+$(BUILD_CMD) -C build unittest +$(BUILD_CMD) -C build unittest
@ -93,4 +95,4 @@ distclean: clean
install: | nvim install: | nvim
+$(BUILD_CMD) -C build install +$(BUILD_CMD) -C build install
.PHONY: test unittest clean distclean nvim cmake deps install .PHONY: test functionaltest unittest clean distclean nvim cmake deps install