aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2018-07-09 11:00:01 -0400
committerJames McCoy <jamessan@jamessan.com>2018-07-11 00:26:07 -0400
commitba7704ab4ea6186f0a3090b930a4be7e3aa9857c (patch)
treec8e64f3dae2afbac5fef8bd2b8530c3c644365ad
parentec6e78e77ca3b3a2b8bbe8b472cf8c5d6545c82d (diff)
downloadrneovim-ba7704ab4ea6186f0a3090b930a4be7e3aa9857c.tar.gz
rneovim-ba7704ab4ea6186f0a3090b930a4be7e3aa9857c.tar.bz2
rneovim-ba7704ab4ea6186f0a3090b930a4be7e3aa9857c.zip
test: Rename includes/pre/uv-errno.h to includes/pre/uv.h
libuv users are only supposed to directly include uv.h. In v1.21.0, all the uv-*.h headers were renamed to uv/*.h, which caused the unit tests to fail with [123/125] Generating post/uv-errno.h FAILED: test/includes/post/uv-errno.h cd «SRCDIR»/src/neovim/build/test/includes && /usr/bin/clang -std=c99 -E -P «SRCDIR»/src/neovim/test/includes/pre/uv-errno.h -I/usr/include -I/usr/include -o «SRCDIR»/neovim/build/test/includes/post/uv-errno.h «SRCDIR»/src/neovim/test/includes/pre/uv-errno.h:1:10: error: 'uv-errno.h' file not found with <angled> include; use "quotes" instead #include <uv-errno.h> ^~~~~~~~~~~~ "uv-errno.h" The intention of the file is to extend libuv's error constants with more values used by the unit tests. This can just as easily be achieved without poking into pseudo-private header files.
-rw-r--r--test/includes/pre/uv.h (renamed from test/includes/pre/uv-errno.h)2
-rw-r--r--test/unit/os/fs_spec.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/includes/pre/uv-errno.h b/test/includes/pre/uv.h
index 6b80f60e5c..da7818cd07 100644
--- a/test/includes/pre/uv-errno.h
+++ b/test/includes/pre/uv.h
@@ -1,4 +1,4 @@
-#include <uv-errno.h>
+#include <uv.h>
static const int kUV_ENOENT = UV_ENOENT;
static const int kUV_EEXIST = UV_EEXIST;
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index ae6dfe6423..ddb438eb3d 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -27,7 +27,7 @@ cimport('./src/nvim/fileio.h')
local fs = cimport('./src/nvim/os/os.h', './src/nvim/path.h')
cppimport('sys/stat.h')
cppimport('fcntl.h')
-cppimport('uv-errno.h')
+cppimport('uv.h')
local s = ''
for i = 0, 255 do