diff options
| author | Daniel Hahler <git@thequod.de> | 2019-08-28 22:47:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 22:47:54 +0200 |
| commit | 6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c (patch) | |
| tree | 537bc9d4b64dce8854cc0327089b8e62ed5d17d0 /Makefile | |
| parent | 1d59575450e0a09d710a7cad2b8e1b5c5e0242f5 (diff) | |
| download | rneovim-6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c.tar.gz rneovim-6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c.tar.bz2 rneovim-6cc76194b2d67d6160a72f017a37b9d3a6b7dd3c.zip | |
tests: use runtime from build for doc/tags with :help (#10479)
This is better practice in general, and allows to remove the "helptags
ALL" hacks.
Ref: https://github.com/neovim/neovim/issues/8824
Ref: https://github.com/neovim/neovim/commit/f1b67c3453c
* Makefile: fix dependencies with regard to helptags
- use the file as the main target to avoid unnecessary triggering
- use "make oldtest" on Travis to ensure it gets built
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -114,7 +114,7 @@ build/.ran-third-party-cmake:: touch $@ # TODO: cmake 3.2+ add_custom_target() has a USES_TERMINAL flag. -oldtest: | nvim helptags +oldtest: | nvim build/runtime/doc/tags +$(SINGLE_MAKE) -C src/nvim/testdir clean ifeq ($(strip $(TEST_FILE)),) +$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG="$(realpath build/bin/nvim)" $(MAKEOVERRIDES) @@ -122,11 +122,11 @@ else +$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG="$(realpath build/bin/nvim)" NEW_TESTS=$(TEST_FILE) SCRIPTS= $(MAKEOVERRIDES) endif -helptags: | nvim +build/runtime/doc/tags helptags: | nvim +$(BUILD_CMD) -C build runtime/doc/tags # Builds help HTML _and_ checks for invalid help tags. -helphtml: | nvim helptags +helphtml: | nvim build/runtime/doc/tags +$(BUILD_CMD) -C build doc_html functionaltest: | nvim |