From d4e2bfbe9cd2a09471da9089f45f89b74d720697 Mon Sep 17 00:00:00 2001 From: Enan Ajmain <3nan.ajmain@gmail.com> Date: Wed, 15 Mar 2023 17:17:30 +0600 Subject: test: Windows not detected in msys shells #22671 Problem: The functional tests have `is_os(s)` to determine if the current os is. E.g. `is_os("win")` returns true if the current os is Windows. This is done by checking if the sysname as detected by luv contains the substring 'windows'. In MSYS shells, the sysname is looks like MINGWXX_NT, where XX is either 32 or 64. So if you're using busted or luv that you built separately, not the nvim-bundled versions, then `is_os(s)` won't work. Solution: Treat sysname containing "mingw" as Windows. --- test/helpers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/helpers.lua') diff --git a/test/helpers.lua b/test/helpers.lua index 008b91073f..b01e966464 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -312,7 +312,7 @@ function module.is_os(s) or s == 'bsd') then error('unknown platform: '..tostring(s)) end - return not not ((s == 'win' and module.sysname():find('windows')) + return not not ((s == 'win' and (module.sysname():find('windows') or module.sysname():find('mingw'))) or (s == 'mac' and module.sysname() == 'darwin') or (s == 'freebsd' and module.sysname() == 'freebsd') or (s == 'openbsd' and module.sysname() == 'openbsd') -- cgit