aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2016-12-28 18:46:58 +0100
committerMarco Hinz <mh.codebro@gmail.com>2016-12-29 02:58:21 +0100
commitd2998a0a49957fc8b01878a0d325f310dd1c5a0c (patch)
treea50f554824dfe9b3574d30eec0a1f150a41d624a
parent9009c20edb066811417aa1a044e643f1d4050f7c (diff)
downloadrneovim-d2998a0a49957fc8b01878a0d325f310dd1c5a0c.tar.gz
rneovim-d2998a0a49957fc8b01878a0d325f310dd1c5a0c.tar.bz2
rneovim-d2998a0a49957fc8b01878a0d325f310dd1c5a0c.zip
Tests: make unit tests work on macOS Sierra
Fixes #5455.
-rw-r--r--test/unit/helpers.lua1
-rw-r--r--test/unit/preprocess.lua7
2 files changed, 7 insertions, 1 deletions
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 91da459393..3564f76442 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -36,6 +36,7 @@ local function filter_complex_blocks(body)
or string.find(line, "_ISwupper", 1, true)
or string.find(line, "msgpack_zone_push_finalizer")
or string.find(line, "msgpack_unpacker_reserve_buffer")
+ or string.find(line, "UUID_NULL") -- static const uuid_t UUID_NULL = {...}
or string.find(line, "inline _Bool")) then
result[#result + 1] = line
end
diff --git a/test/unit/preprocess.lua b/test/unit/preprocess.lua
index e5c838b13b..10ba997758 100644
--- a/test/unit/preprocess.lua
+++ b/test/unit/preprocess.lua
@@ -105,7 +105,12 @@ local Gcc = {
'-DINCLUDE_GENERATED_DECLARATIONS',
-- Needed for FreeBSD
- '-D "_Thread_local="'
+ '-D "_Thread_local="',
+
+ -- Needed for macOS Sierra
+ '-D "_Nullable="',
+ '-D "_Nonnull="',
+ '-U__BLOCKS__',
}
}