aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/helpers.lua5
-rw-r--r--test/unit/os/fs_spec.lua2
-rw-r--r--test/unit/preprocess.lua5
3 files changed, 5 insertions, 7 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index e63c79ec80..ea98ff4ce3 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,8 +1,3 @@
-if jit then
- -- Disable JIT because of random errors on Travis with OS X.
- jit.off(true, true)
-end
-
require('coxpcall')
local Loop = require('nvim.loop')
local MsgpackStream = require('nvim.msgpack_stream')
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index 1c7d3650a5..9e5a2349c8 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -270,7 +270,7 @@ describe('fs function', function()
it('owner of a file may change the group of the file to any group of which that owner is a member', function()
-- Some systems may not have `id` utility.
- if (os.execute('id -G &> /dev/null') == 0) then
+ if (os.execute('id -G > /dev/null 2>&1') == 0) then
local file_gid = lfs.attributes(filename, 'gid')
-- Gets ID of any group of which current user is a member except the
diff --git a/test/unit/preprocess.lua b/test/unit/preprocess.lua
index f17c7ba666..d4c2e088a4 100644
--- a/test/unit/preprocess.lua
+++ b/test/unit/preprocess.lua
@@ -102,7 +102,10 @@ local Gcc = {
'-D "EXTERN=extern"',
'-D "INIT(...)="',
'-D_GNU_SOURCE',
- '-DINCLUDE_GENERATED_DECLARATIONS'
+ '-DINCLUDE_GENERATED_DECLARATIONS',
+
+ -- Needed for FreeBSD
+ '-D "_Thread_local="'
}
}