diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | man/nvim.1 | 1 | ||||
| -rw-r--r-- | runtime/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | test/functional/ui/inccommand_spec.lua | 3 | ||||
| -rw-r--r-- | test/functional/ui/input_spec.lua | 3 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 3 |
6 files changed, 17 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 93caf9ef75..e6b9516b6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,8 @@ jobs: - os: osx compiler: gcc osx_image: xcode9.4 # macOS 10.13 - - os: linux + - if: branch = master + os: linux env: CI_TARGET=lint - stage: Flaky builds os: linux @@ -126,6 +127,7 @@ addons: branches: only: - master + - /^release-\d+\.\d+$/ cache: apt: true diff --git a/man/nvim.1 b/man/nvim.1 index b9f47cc851..4d338321c4 100644 --- a/man/nvim.1 +++ b/man/nvim.1 @@ -56,6 +56,7 @@ Reads text from standard input until .Dv EOF , then opens a buffer with that text. User input is read from standard error, which should be a terminal. +.El .Sh OPTIONS .Bl -tag -width Fl .It Fl t Ar tag diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index ad706af087..f3bfd786ad 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -29,21 +29,16 @@ foreach(PACKAGE ${PACKAGES}) file(GLOB "${PACKNAME}_DOC_FILES" ${PACKAGE}/doc/*.txt) if(${PACKNAME}_DOC_FILES) file(MAKE_DIRECTORY ${GENERATED_PACKAGE_DIR}/${PACKNAME}) - add_custom_target("${PACKNAME}-tags" + add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags" COMMAND ${CMAKE_COMMAND} -E copy_directory ${PACKAGE} ${GENERATED_PACKAGE_DIR}/${PACKNAME} COMMAND "${PROJECT_BINARY_DIR}/bin/nvim" -u NONE -i NONE -e --headless -c "helptags doc" -c quit DEPENDS nvim + nvim_runtime_deps WORKING_DIRECTORY "${GENERATED_PACKAGE_DIR}/${PACKNAME}" ) - add_dependencies(${PACKNAME}-tags nvim_runtime_deps) - - add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags" - DEPENDS - "${PACKNAME}-tags" - ) set("${PACKNAME}_DOC_NAMES") foreach(DF "${${PACKNAME}_DOC_FILES}") @@ -67,7 +62,7 @@ foreach(DF ${DOCFILES}) list(APPEND BUILDDOCFILES ${GENERATED_RUNTIME_DIR}/doc/${F}) endforeach() -add_custom_target(helptags +add_custom_command(OUTPUT ${GENERATED_HELP_TAGS} COMMAND ${CMAKE_COMMAND} -E remove doc/* COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/runtime/doc doc @@ -75,14 +70,10 @@ add_custom_target(helptags -u NONE -i NONE -e --headless -c "helptags ++t doc" -c quit DEPENDS nvim + nvim_runtime_deps WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}" ) -add_dependencies(helptags nvim_runtime_deps) -add_custom_command(OUTPUT ${GENERATED_HELP_TAGS} - DEPENDS - helptags -) add_custom_target(doc_html COMMAND make html diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua index bb6cb543ed..3228d6b7fc 100644 --- a/test/functional/ui/inccommand_spec.lua +++ b/test/functional/ui/inccommand_spec.lua @@ -2512,6 +2512,9 @@ describe(":substitute", function() end) it(':substitute with inccommand during :terminal activity', function() + if helpers.skip_fragile(pending) then + return + end retry(2, 40000, function() local screen = Screen.new(30,15) clear() diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua index 7f9cd190ee..850efed282 100644 --- a/test/functional/ui/input_spec.lua +++ b/test/functional/ui/input_spec.lua @@ -61,6 +61,9 @@ describe('feeding large chunks of input with <Paste>', function() end) it('ok', function() + if helpers.skip_fragile(pending) then + return + end local t = {} for i = 1, 20000 do t[i] = 'item ' .. tostring(i) diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index aa99499ec6..87b489fd71 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -51,6 +51,9 @@ describe("shell command :!", function() end) it("throttles shell-command output greater than ~10KB", function() + if helpers.skip_fragile(pending) then + return + end child_session.feed_data( ":!for i in $(seq 2 30000); do echo XXXXXXXXXX $i; done\n") |