aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/functional/core/channels_spec.lua2
-rw-r--r--test/functional/helpers.lua14
-rw-r--r--test/functional/terminal/tui_spec.lua8
-rw-r--r--test/functional/ui/cmdline_spec.lua2
-rw-r--r--test/functional/ui/embed_spec.lua2
-rw-r--r--test/functional/ui/output_spec.lua2
-rw-r--r--test/helpers.lua20
7 files changed, 26 insertions, 24 deletions
diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua
index 30dcb6d7b4..852d9808f5 100644
--- a/test/functional/core/channels_spec.lua
+++ b/test/functional/core/channels_spec.lua
@@ -139,7 +139,7 @@ describe('channels', function()
command("call chansend(id, 'incomplet\004')")
- local is_bsd = not not string.find(string.lower(uname()), 'bsd')
+ local is_bsd = not not string.find(uname(), 'bsd')
local bsdlike = is_bsd or (os_name() == "osx")
local extra = bsdlike and "^D\008\008" or ""
expect_twoline(id, "stdout",
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
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 01e13ce4d4..99b25cbf48 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -902,7 +902,7 @@ end)
-- does not initialize the TUI.
describe("TUI 't_Co' (terminal colors)", function()
local screen
- local is_freebsd = (string.lower(uname()) == 'freebsd')
+ local is_freebsd = (uname() == 'freebsd')
local function assert_term_colors(term, colorterm, maxcolors)
helpers.clear({env={TERM=term}, args={}})
@@ -1176,8 +1176,8 @@ end)
-- does not initialize the TUI.
describe("TUI 'term' option", function()
local screen
- local is_bsd = not not string.find(string.lower(uname()), 'bsd')
- local is_macos = not not string.find(string.lower(uname()), 'darwin')
+ local is_bsd = not not string.find(uname(), 'bsd')
+ local is_macos = not not string.find(uname(), 'darwin')
local function assert_term(term_envvar, term_expected)
clear()
@@ -1203,7 +1203,7 @@ describe("TUI 'term' option", function()
end)
it('gets system-provided term if $TERM is valid', function()
- if string.lower(uname()) == "openbsd" then
+ if uname() == "openbsd" then
assert_term("xterm", "xterm")
elseif is_bsd then -- BSD lacks terminfo, builtin is always used.
assert_term("xterm", "builtin_xterm")
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
index ea68d9a431..f9769c706f 100644
--- a/test/functional/ui/cmdline_spec.lua
+++ b/test/functional/ui/cmdline_spec.lua
@@ -828,7 +828,7 @@ describe('cmdline redraw', function()
end)
it('with <Cmd>', function()
- if 'openbsd' == string.lower(helpers.uname()) then
+ if 'openbsd' == helpers.uname() then
pending('FIXME #10804', function() end)
return
end
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index 6b2ad7c72b..5e09dc4289 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -49,7 +49,7 @@ local function test_embed(ext_linegrid)
end)
it("doesn't erase output when setting color scheme", function()
- if 'openbsd' == string.lower(helpers.uname()) then
+ if 'openbsd' == helpers.uname() then
pending('FIXME #10804', function() end)
return
end
diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua
index 4088cb77fa..c028f44b44 100644
--- a/test/functional/ui/output_spec.lua
+++ b/test/functional/ui/output_spec.lua
@@ -50,7 +50,7 @@ describe("shell command :!", function()
end)
it("throttles shell-command output greater than ~10KB", function()
- if 'openbsd' == string.lower(helpers.uname()) then
+ if 'openbsd' == helpers.uname() then
pending('FIXME #10804', function() end)
return
end
diff --git a/test/helpers.lua b/test/helpers.lua
index 08a7822b19..25fff55596 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -158,7 +158,11 @@ function module.check_logs()
table.concat(runtime_errors, ', ')))
end
--- Tries to get platform name from $SYSTEM_NAME, uname; fallback is "Windows".
+function module.iswin()
+ return package.config:sub(1,1) == '\\'
+end
+
+-- Gets (lowercase) OS name from CMake, uname, or "win" if iswin().
module.uname = (function()
local platform = nil
return (function()
@@ -166,17 +170,19 @@ module.uname = (function()
return platform
end
- platform = os.getenv("SYSTEM_NAME")
- if platform then
+ if os.getenv("SYSTEM_NAME") then -- From CMAKE_SYSTEM_NAME.
+ platform = string.lower(os.getenv("SYSTEM_NAME"))
return platform
end
local status, f = pcall(module.popen_r, 'uname', '-s')
if status then
- platform = f:read("*l")
+ platform = string.lower(f:read("*l"))
f:close()
+ elseif module.iswin() then
+ platform = 'windows'
else
- platform = 'Windows'
+ error('unknown platform')
end
return platform
end)
@@ -203,11 +209,11 @@ module.tmpname = (function()
return fname
else
local fname = os.tmpname()
- if module.uname() == 'Windows' and fname:sub(1, 2) == '\\s' then
+ if module.uname() == 'windows' and fname:sub(1, 2) == '\\s' then
-- In Windows tmpname() returns a filename starting with
-- special sequence \s, prepend $TEMP path
return tmpdir..fname
- elseif fname:match('^/tmp') and module.uname() == 'Darwin' then
+ elseif fname:match('^/tmp') and module.uname() == 'darwin' then
-- In OS X /tmp links to /private/tmp
return '/private'..fname
else
generated by cgit (git 2.34.1) at 2025-06-11 23:08:41 +0000