aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--Makefile8
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