From ba7704ab4ea6186f0a3090b930a4be7e3aa9857c Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 9 Jul 2018 11:00:01 -0400 Subject: test: Rename includes/pre/uv-errno.h to includes/pre/uv.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 include; use "quotes" instead #include ^~~~~~~~~~~~ "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. --- test/includes/pre/uv-errno.h | 4 ---- test/includes/pre/uv.h | 4 ++++ test/unit/os/fs_spec.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 test/includes/pre/uv-errno.h create mode 100644 test/includes/pre/uv.h diff --git a/test/includes/pre/uv-errno.h b/test/includes/pre/uv-errno.h deleted file mode 100644 index 6b80f60e5c..0000000000 --- a/test/includes/pre/uv-errno.h +++ /dev/null @@ -1,4 +0,0 @@ -#include - -static const int kUV_ENOENT = UV_ENOENT; -static const int kUV_EEXIST = UV_EEXIST; diff --git a/test/includes/pre/uv.h b/test/includes/pre/uv.h new file mode 100644 index 0000000000..da7818cd07 --- /dev/null +++ b/test/includes/pre/uv.h @@ -0,0 +1,4 @@ +#include + +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 -- cgit