1 files changed, 24 insertions, 12 deletions
diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua
index bb2919d4fb..d5e061bb50 100644
--- a/test/functional/shada/helpers.lua
+++ b/test/functional/shada/helpers.lua
@@ -5,33 +5,43 @@ local write_file, merge_args = helpers.write_file, helpers.merge_args
 
 local mpack = require('mpack')
 
-local tmpname = os.tmpname()
-local additional_cmd = ''
+local tmpname = helpers.tmpname()
+local append_argv = nil
 
-local function nvim_argv()
-  local argv = {nvim_prog, '-u', 'NONE', '-i', tmpname, '-N',
+local function nvim_argv(shada_file, embed)
+  if embed == nil then
+    embed = true
+  end
+  local argv = {nvim_prog, '-u', 'NONE', '-i', shada_file or tmpname, '-N',
                 '--cmd', 'set shortmess+=I background=light noswapfile',
-                '--cmd', additional_cmd,
-                '--embed'}
-  if helpers.prepend_argv then
-    return merge_args(helpers.prepend_argv, argv)
+                '--headless', embed  and '--embed' or nil}
+  if helpers.prepend_argv or append_argv then
+    return merge_args(helpers.prepend_argv, argv, append_argv)
   else
     return argv
   end
 end
 
-local reset = function()
-  set_session(spawn(nvim_argv()))
+local reset = function(shada_file)
+  set_session(spawn(nvim_argv(shada_file)))
   meths.set_var('tmpname', tmpname)
 end
 
 local set_additional_cmd = function(s)
-  additional_cmd = s
+  append_argv = {'--cmd', s}
+end
+
+local function add_argv(...)
+  if select('#', ...) == 0 then
+    append_argv = nil
+  else
+    append_argv = {...}
+  end
 end
 
 local clear = function()
   os.remove(tmpname)
-  set_additional_cmd('')
+  append_argv = nil
 end
 
 local get_shada_rw = function(fname)
@@ -80,7 +90,9 @@ end
 return {
   reset=reset,
   set_additional_cmd=set_additional_cmd,
+  add_argv=add_argv,
   clear=clear,
   get_shada_rw=get_shada_rw,
   read_shada_file=read_shada_file,
+  nvim_argv=nvim_argv,
 }