aboutsummaryrefslogtreecommitdiff
path: root/test/functional/helpers.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-09-01 21:21:26 -0700
committerJustin M. Keyes <justinkz@gmail.com>2019-09-01 22:49:33 -0700
commitead39d6ce6d1c5e5b6130c6823d071889c207bde (patch)
tree0a1b0b8707e6a951e3318bfbba80a1764749a2dd /test/functional/helpers.lua
parent7d2090772488e9d57532c2f3d72438370027d3b9 (diff)
downloadrneovim-ead39d6ce6d1c5e5b6130c6823d071889c207bde.tar.gz
rneovim-ead39d6ce6d1c5e5b6130c6823d071889c207bde.tar.bz2
rneovim-ead39d6ce6d1c5e5b6130c6823d071889c207bde.zip
test/uname(): always lowercase
Diffstat (limited to 'test/functional/helpers.lua')
-rw-r--r--test/functional/helpers.lua14
1 files changed, 5 insertions, 9 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index c718a37021..c34849b439 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -48,7 +48,7 @@ if module.nvim_dir == module.nvim_prog then
end
local tmpname = global_helpers.tmpname
-local uname = global_helpers.uname
+local iswin = global_helpers.iswin
local prepend_argv
if os.getenv('VALGRIND') then
@@ -287,10 +287,6 @@ module.os_name = (function()
end)
end)()
-function module.iswin()
- return package.config:sub(1,1) == '\\'
-end
-
-- Executes a VimL function.
-- Fails on VimL error, but does not update v:errmsg.
function module.call(name, ...)
@@ -672,7 +668,7 @@ end
-- Helper to skip tests. Returns true in Windows systems.
-- pending_fn is pending() from busted
function module.pending_win32(pending_fn)
- if uname() == 'Windows' then
+ if iswin() then
if pending_fn ~= nil then
pending_fn('FIXME: Windows', function() end)
end
@@ -734,12 +730,12 @@ function module.redir_exec(cmd)
end
function module.get_pathsep()
- return module.iswin() and '\\' or '/'
+ return iswin() and '\\' or '/'
end
function module.pathroot()
local pathsep = package.config:sub(1,1)
- return module.iswin() and (module.nvim_dir:sub(1,2)..pathsep) or '/'
+ return iswin() and (module.nvim_dir:sub(1,2)..pathsep) or '/'
end
-- Returns a valid, platform-independent $NVIM_LISTEN_ADDRESS.
@@ -765,7 +761,7 @@ function module.missing_provider(provider)
end
function module.alter_slashes(obj)
- if not module.iswin() then
+ if not iswin() then
return obj
end
if type(obj) == 'string' then