From b904c33e418f3c9013f0f145217f09ab9b87efd9 Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Wed, 5 Nov 2014 11:54:20 +0100 Subject: [PATCH] CMake: Rename target "test" to "functionaltest". 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. --- CMakeLists.txt | 4 ++-- Makefile | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef0889589f..632879c4a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ if(BUSTED_PRG) -P ${CMAKE_MODULE_PATH}/RunTests.cmake DEPENDS nvim-test unittest-headers) - add_custom_target(test + add_custom_target(functionaltest COMMAND ${CMAKE_COMMAND} -DBUSTED_PRG=${BUSTED_PRG} -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR} @@ -258,5 +258,5 @@ if(BUSTED_PRG) -DBUILD_DIR=${CMAKE_BINARY_DIR} -DTEST_TYPE=functional -P ${CMAKE_MODULE_PATH}/RunTests.cmake - DEPENDS nvim) + DEPENDS nvim) endif() diff --git a/Makefile b/Makefile index a4604cc67f..5f551d4ed5 100644 --- a/Makefile +++ b/Makefile @@ -77,8 +77,10 @@ endif oldtest: | nvim +$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES) -test: | nvim - +$(BUILD_CMD) -C build test +functionaltest: | nvim + +$(BUILD_CMD) -C build functionaltest + +test: functionaltest unittest: | nvim +$(BUILD_CMD) -C build unittest @@ -93,4 +95,4 @@ distclean: clean install: | nvim +$(BUILD_CMD) -C build install -.PHONY: test unittest clean distclean nvim cmake deps install +.PHONY: test functionaltest unittest clean distclean nvim cmake deps install