diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2016-03-07 15:20:16 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2016-03-07 15:20:16 -0300 |
| commit | 37b3a4c607a1305ce56e96837e305fd637fde0e8 (patch) | |
| tree | 2b825e07c89d31557b4e6c6c6dcff029de6a5ded /Makefile | |
| parent | bd81239f2f98e46f8565c7d80d586381881e78b4 (diff) | |
| parent | 6674930d7c15e30b6110c4ff2489dd30985969e6 (diff) | |
| download | rneovim-37b3a4c607a1305ce56e96837e305fd637fde0e8.tar.gz rneovim-37b3a4c607a1305ce56e96837e305fd637fde0e8.tar.bz2 rneovim-37b3a4c607a1305ce56e96837e305fd637fde0e8.zip | |
Merge PR #4423 'Make functional tests compatible with lua'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -45,6 +45,11 @@ ifneq (,$(USE_BUNDLED_DEPS)) BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED_DEPS) endif +ifneq (,$(findstring functionaltest-lua,$(MAKECMDGOALS))) + BUNDLED_LUA_CMAKE_FLAG := -DUSE_BUNDLED_LUA=ON + $(shell [ -x .deps/usr/bin/lua ] || rm build/.ran-*) +endif + # For use where we want to make sure only a single job is run. This does issue # a warning, but we need to keep SCRIPTS argument. SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE) @@ -74,7 +79,7 @@ build/.ran-third-party-cmake: ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),) mkdir -p .deps cd .deps && \ - cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) \ + cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \ $(DEPS_CMAKE_FLAGS) ../third-party endif mkdir -p build @@ -86,6 +91,9 @@ oldtest: | nvim functionaltest: | nvim +$(BUILD_CMD) -C build functionaltest +functionaltest-lua: | nvim + +$(BUILD_CMD) -C build functionaltest-lua + testlint: | nvim $(BUILD_CMD) -C build testlint |