Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

third-party: update libuv to v1.32.0 #10978

Merged
merged 3 commits into from
Sep 25, 2019
Merged

third-party: update libuv to v1.32.0 #10978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
227ef71
third-party: update libuv to v1.31.0
blueyed Sep 9, 2019
bb6b126
Revert "win/os_env_exists(): workaround libuv bug #10734"
blueyed Sep 11, 2019
70827ea
test/functional/preload.lua: _set_fmode for Windows
blueyed Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/nvim/os/env.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ bool os_env_exists(const char *name)
assert(r != UV_EINVAL);
if (r != 0 && r != UV_ENOENT && r != UV_ENOBUFS) {
ELOG("uv_os_getenv(%s) failed: %d %s", name, r, uv_err_name(r));
#ifdef WIN32
return (r == UV_UNKNOWN);
#endif
}
return (r == 0 || r == UV_ENOBUFS);
}
Expand Down
1 change: 1 addition & 0 deletions test/functional/eval/environ_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ describe('environment variables', function()
eq("", environ()['EMPTY_VAR'])
eq(nil, environ()['DOES_NOT_EXIST'])
end)

it('exists() handles empty env variable', function()
clear({env={EMPTY_VAR=""}})
eq(1, exists('$EMPTY_VAR'))
Expand Down
10 changes: 10 additions & 0 deletions test/functional/preload.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,13 @@
-- Busted started doing this to help provide more isolation. See issue #62
-- for more information about this.
local helpers = require('test.functional.helpers')(nil)
local iswin = helpers.iswin

if iswin() then
local ffi = require('ffi')
ffi.cdef[[
typedef int errno_t;
errno_t _set_fmode(int mode);
]]
ffi.C._set_fmode(0x8000)
end
9 changes: 5 additions & 4 deletions third-party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,12 @@ include(ExternalProject)

if(WIN32)
# "nvim" branch of https://github.com/neovim/libuv
set(LIBUV_URL https://github.com/neovim/libuv/archive/eeae18d085de25f138c23966f98a179f0fb609e7.tar.gz)
set(LIBUV_SHA256 c37d0b7cb1defe69ae8dbb4d712c0d7cf838d6539178e8bcf71c72579ab5b666)
set(LIBUV_URL https://github.com/neovim/libuv/archive/d5ff3004d26b9bb863b76247399a9c72a0ff184c.tar.gz)
set(LIBUV_SHA256 0f5dfd92269713ed275273966ed73578fc68db669c509b01210cd58c1cf6361d)
else()
set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.30.0.tar.gz)
set(LIBUV_SHA256 44c8fdadf3b3f393006a4ac4ba144020673a3f9cd72bed1fbb2c366ebcf0d199)
# blueyed/nvim-fixes (for *BSD build fixes).
set(LIBUV_URL https://github.com/blueyed/libuv/archive/2af4cf2.tar.gz)
set(LIBUV_SHA256 SKIP)
endif()

set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-3.0.0/msgpack-3.0.0.tar.gz)
Expand Down