aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/eval/printf_spec.lua32
-rw-r--r--test/functional/helpers.lua3
2 files changed, 34 insertions, 1 deletions
diff --git a/test/functional/eval/printf_spec.lua b/test/functional/eval/printf_spec.lua
index c84290ceef..27e24c4118 100644
--- a/test/functional/eval/printf_spec.lua
+++ b/test/functional/eval/printf_spec.lua
@@ -1,7 +1,10 @@
local helpers = require('test.functional.helpers')(after_each)
+
local clear = helpers.clear
local eq = helpers.eq
+local eval = helpers.eval
local funcs = helpers.funcs
+local meths = helpers.meths
local exc_exec = helpers.exc_exec
describe('printf()', function()
@@ -57,4 +60,33 @@ describe('printf()', function()
it('errors out when %b modifier is used for a float', function()
eq('Vim(call):E805: Using a Float as a Number', exc_exec('call printf("%b", 3.1415926535)'))
end)
+ it('works with %p correctly', function()
+ local null_ret = nil
+ local seen_rets = {}
+ -- Collect all args in an array to avoid possible allocation of the same
+ -- address after freeing unreferenced values.
+ meths.set_var('__args', {})
+ local function check_printf(expr, is_null)
+ eq(0, exc_exec('call add(__args, ' .. expr .. ')'))
+ eq(0, exc_exec('let __result = printf("%p", __args[-1])'))
+ local id_ret = eval('id(__args[-1])')
+ eq(id_ret, meths.get_var('__result'))
+ if is_null then
+ if null_ret then
+ eq(null_ret, id_ret)
+ else
+ null_ret = id_ret
+ end
+ else
+ eq(nil, seen_rets[id_ret])
+ seen_rets[id_ret] = expr
+ end
+ meths.del_var('__result')
+ end
+ check_printf('v:_null_list', true)
+ check_printf('v:_null_dict', true)
+ check_printf('[]')
+ check_printf('{}')
+ check_printf('function("tr", ["a"])')
+ end)
end)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index ca59c0dd2e..4db658d98c 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -17,7 +17,8 @@ local map = global_helpers.map
local filter = global_helpers.filter
local start_dir = lfs.currentdir()
-local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim'
+-- XXX: NVIM_PROG takes precedence, QuickBuild sets it.
+local nvim_prog = os.getenv('NVIM_PROG') or os.getenv('NVIM_PRG') or 'build/bin/nvim'
local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
'--cmd', 'set shortmess+=I background=light noswapfile noautoindent laststatus=1 undodir=. directory=. viewdir=. backupdir=.',
'--embed'}