IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32243 from jamessan/snprintf-unit-tests

Browse Source 
Fix "vim_snprintf() positional arguments" failures on 32-bit systems
This commit is contained in:
James McCoy 2025-01-29 12:56:15 -07:00 committed by GitHub
commit a9f039c5be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/unit/strings_spec.lua
View File

@ -1,6 +1,7 @@
local t = require('test.unit.testutil') local t = require('test.unit.testutil')
local itp = t.gen_itp(it) local itp = t.gen_itp(it)
local child_call_once = t.child_call_once
local cimport = t.cimport local cimport = t.cimport
local eq = t.eq local eq = t.eq
local ffi = t.ffi local ffi = t.ffi
@ -8,6 +9,12 @@ local to_cstr = t.to_cstr
local strings = cimport('stdlib.h', './src/nvim/strings.h', './src/nvim/memory.h') local strings = cimport('stdlib.h', './src/nvim/strings.h', './src/nvim/memory.h')
local UVARNUM_TYPE
child_call_once(function()
UVARNUM_TYPE = ffi.typeof('uvarnumber_T')
end)
describe('vim_strsave_escaped()', function() describe('vim_strsave_escaped()', function()
local vim_strsave_escaped = function(s, chars) local vim_strsave_escaped = function(s, chars)
local res = strings.vim_strsave_escaped(to_cstr(s), to_cstr(chars)) local res = strings.vim_strsave_escaped(to_cstr(s), to_cstr(chars))
@ -140,13 +147,22 @@ end)
describe('vim_snprintf()', function() describe('vim_snprintf()', function()
local function a(expected, buf, bsize, fmt, ...) local function a(expected, buf, bsize, fmt, ...)
eq(#expected, strings.vim_snprintf(buf, bsize, fmt, ...)) local args = { ... }
local ctx = string.format('snprintf(buf, %d, "%s"', bsize, fmt)
for _, x in ipairs(args) do
ctx = ctx .. ', ' .. tostring(x)
end
ctx = ctx .. string.format(') = %s', expected)
eq(#expected, strings.vim_snprintf(buf, bsize, fmt, ...), ctx)
if bsize > 0 then if bsize > 0 then
local actual = ffi.string(buf, math.min(#expected + 1, bsize)) local actual = ffi.string(buf, math.min(#expected + 1, bsize))
eq(expected:sub(1, bsize - 1) .. '\0', actual) eq(expected:sub(1, bsize - 1) .. '\0', actual)
end end
end end
local function uv(n)
return ffi.cast(UVARNUM_TYPE, n)
end
local function i(n) local function i(n)
return ffi.cast('int', n) return ffi.cast('int', n)
end end
@ -181,7 +197,7 @@ describe('vim_snprintf()', function()
a(' 1234567', buf, bsize, '%9ld', l(1234567)) a(' 1234567', buf, bsize, '%9ld', l(1234567))
a('1234567 ', buf, bsize, '%-9ld', l(1234567)) a('1234567 ', buf, bsize, '%-9ld', l(1234567))
a('deadbeef', buf, bsize, '%x', u(0xdeadbeef)) a('deadbeef', buf, bsize, '%x', u(0xdeadbeef))
a('001100', buf, bsize, '%06b', u(12)) a('001100', buf, bsize, '%06b', uv(12))
a('one two', buf, bsize, '%s %s', 'one', 'two') a('one two', buf, bsize, '%s %s', 'one', 'two')
a('1.234000', buf, bsize, '%f', 1.234) a('1.234000', buf, bsize, '%f', 1.234)
a('1.234000e+00', buf, bsize, '%e', 1.234) a('1.234000e+00', buf, bsize, '%e', 1.234)
@ -223,10 +239,10 @@ describe('vim_snprintf()', function()
a('three one two', buf, bsize, '%3$s %1$s %2$s', 'one', 'two', 'three') a('three one two', buf, bsize, '%3$s %1$s %2$s', 'one', 'two', 'three')
a('1234567', buf, bsize, '%1$d', i(1234567)) a('1234567', buf, bsize, '%1$d', i(1234567))
a('deadbeef', buf, bsize, '%1$x', u(0xdeadbeef)) a('deadbeef', buf, bsize, '%1$x', u(0xdeadbeef))
a('001100', buf, bsize, '%2$0*1$b', i(6), u(12)) a('001100', buf, bsize, '%2$0*1$b', i(6), uv(12))
a('001100', buf, bsize, '%1$0.*2$b', u(12), i(6)) a('001100', buf, bsize, '%1$0.*2$b', uv(12), i(6))
a('one two', buf, bsize, '%1$s %2$s', 'one', 'two') a('one two', buf, bsize, '%1$s %2$s', 'one', 'two')
a('001100', buf, bsize, '%06b', u(12)) a('001100', buf, bsize, '%06b', uv(12))
a('two one', buf, bsize, '%2$s %1$s', 'one', 'two') a('two one', buf, bsize, '%2$s %1$s', 'one', 'two')
a('1.234000', buf, bsize, '%1$f', 1.234) a('1.234000', buf, bsize, '%1$f', 1.234)
a('1.234000e+00', buf, bsize, '%1$e', 1.234) a('1.234000e+00', buf, bsize, '%1$e', 1.234)