diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-29 22:25:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-29 22:25:00 +0200 |
| commit | 52fced6090aaf9c633e613e5fd46f0793705f22c (patch) | |
| tree | f28618454530f922d399385d85da5e32de723c4a | |
| parent | 9875372607cb5afd21780b3917b0ed6899098e7c (diff) | |
| download | rneovim-52fced6090aaf9c633e613e5fd46f0793705f22c.tar.gz rneovim-52fced6090aaf9c633e613e5fd46f0793705f22c.tar.bz2 rneovim-52fced6090aaf9c633e613e5fd46f0793705f22c.zip | |
build: update some test dependencies (#10339)
* build: update some test dependencies
* luacheck ignores
* BuildLua: add ${BUSTED} to depends for ${BUSTED_LUA}
This is required to rebuild it when busted gets updated.
| -rw-r--r-- | test/functional/normal/put_spec.lua | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLua.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/test/functional/normal/put_spec.lua b/test/functional/normal/put_spec.lua index 29cef13e39..40a4f051e3 100644 --- a/test/functional/normal/put_spec.lua +++ b/test/functional/normal/put_spec.lua @@ -659,6 +659,7 @@ describe('put command', function() end) describe('put after the line with virtualedit', function() + -- luacheck: ignore 621 local test_string = [[ Line of words 1 test_stringx" Line of words 2]] @@ -855,6 +856,7 @@ describe('put command', function() end) describe('. register special tests', function() + -- luacheck: ignore 621 before_each(reset) it('applies control character actions', function() feed('i<C-t><esc>u') diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake index eab835a096..c3f789509e 100644 --- a/third-party/cmake/BuildLua.cmake +++ b/third-party/cmake/BuildLua.cmake @@ -91,7 +91,7 @@ set(BUSTED_LUA ${BUSTED}-lua) add_custom_command(OUTPUT ${BUSTED_LUA} COMMAND sed -e 's/^exec/exec $$LUA_DEBUGGER/' -e 's/jit//g' < ${BUSTED} > ${BUSTED_LUA} && chmod +x ${BUSTED_LUA} - DEPENDS lua busted) + DEPENDS lua busted ${BUSTED}) add_custom_target(busted-lua DEPENDS ${DEPS_INSTALL_DIR}/bin/busted-lua) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index 2ae0e84ecd..f6caa8bad5 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -111,7 +111,7 @@ endif() # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/mpack COMMAND ${LUAROCKS_BINARY} - ARGS build mpack 1.0.7-0 ${LUAROCKS_BUILDARGS} + ARGS build mpack 1.0.8-0 ${LUAROCKS_BUILDARGS} DEPENDS luarocks) add_custom_target(mpack DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/mpack) @@ -120,7 +120,7 @@ list(APPEND THIRD_PARTY_DEPS mpack) # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lpeg COMMAND ${LUAROCKS_BINARY} - ARGS build lpeg 1.0.1-1 ${LUAROCKS_BUILDARGS} + ARGS build lpeg 1.0.2-1 ${LUAROCKS_BUILDARGS} DEPENDS mpack) add_custom_target(lpeg DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/lpeg) @@ -174,7 +174,7 @@ if(USE_BUNDLED_BUSTED) # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${BUSTED_EXE} COMMAND ${LUAROCKS_BINARY} - ARGS build busted 2.0.rc12-1 ${LUAROCKS_BUILDARGS} + ARGS build busted 2.0.rc13-0 ${LUAROCKS_BUILDARGS} DEPENDS penlight) add_custom_target(busted DEPENDS ${BUSTED_EXE}) @@ -182,7 +182,7 @@ if(USE_BUNDLED_BUSTED) # DEPENDS on the previous module, because Luarocks breaks if parallel. add_custom_command(OUTPUT ${LUACHECK_EXE} COMMAND ${LUAROCKS_BINARY} - ARGS build luacheck 0.21.2-1 ${LUAROCKS_BUILDARGS} + ARGS build luacheck 0.23.0-1 ${LUAROCKS_BUILDARGS} DEPENDS busted) add_custom_target(luacheck DEPENDS ${LUACHECK_EXE}) |