8 files changed, 48 insertions, 7 deletions
diff --git a/test/functional/eval/executable_spec.lua b/test/functional/eval/executable_spec.lua
index a1cf056907..28aefb72e5 100644
--- a/test/functional/eval/executable_spec.lua
+++ b/test/functional/eval/executable_spec.lua
@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local eq, clear, call, iswin, write_file, command =
   helpers.eq, helpers.clear, helpers.call, helpers.iswin, helpers.write_file,
   helpers.command
+local exc_exec = helpers.exc_exec
 local eval = helpers.eval
 
 describe('executable()', function()
@@ -10,6 +11,20 @@ describe('executable()', function()
   it('returns 1 for commands in $PATH', function()
     local exe = iswin() and 'ping' or 'ls'
     eq(1, call('executable', exe))
+    command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
+    eq(1, call('executable', 'null'))
+    eq(1, call('executable', 'true'))
+    eq(1, call('executable', 'false'))
+  end)
+
+  it('fails for invalid values', function()
+    for _, input in ipairs({'""', 'v:null', 'v:true', 'v:false', '{}', '[]'}) do
+      eq('Vim(call):E928: String required', exc_exec('call executable('..input..')'))
+    end
+    command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
+    for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do
+      eq('Vim(call):E928: String required', exc_exec('call executable('..input..')'))
+    end
   end)
 
   it('returns 0 for non-existent files', function()
diff --git a/test/functional/eval/exepath_spec.lua b/test/functional/eval/exepath_spec.lua
index 10a11aeacc..08d2c59af8 100644
--- a/test/functional/eval/exepath_spec.lua
+++ b/test/functional/eval/exepath_spec.lua
@@ -1,14 +1,40 @@
 local helpers = require('test.functional.helpers')(after_each)
 local eq, clear, call, iswin =
   helpers.eq, helpers.clear, helpers.call, helpers.iswin
+local command = helpers.command
+local exc_exec = helpers.exc_exec
+local matches = helpers.matches
 
-describe('exepath() (Windows)', function()
-  if not iswin() then return end  -- N/A for Unix.
+describe('exepath()', function()
+  before_each(clear)
 
-  it('append extension if omitted', function()
-    local filename = 'cmd'
-    local pathext = '.exe'
-    clear({env={PATHEXT=pathext}})
-    eq(call('exepath', filename..pathext), call('exepath', filename))
+  it('returns 1 for commands in $PATH', function()
+    local exe = iswin() and 'ping' or 'ls'
+    local ext_pat = iswin() and '%.EXE$' or '$'
+    matches(exe .. ext_pat, call('exepath', exe))
+    command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
+    ext_pat = iswin() and '%.CMD$' or '$'
+    matches('null' .. ext_pat, call('exepath', 'null'))
+    matches('true' .. ext_pat, call('exepath', 'true'))
+    matches('false' .. ext_pat, call('exepath', 'false'))
   end)
+
+  it('fails for invalid values', function()
+    for _, input in ipairs({'""', 'v:null', 'v:true', 'v:false', '{}', '[]'}) do
+      eq('Vim(call):E928: String required', exc_exec('call exepath('..input..')'))
+    end
+    command('let $PATH = fnamemodify("./test/functional/fixtures/bin", ":p")')
+    for _, input in ipairs({'v:null', 'v:true', 'v:false'}) do
+      eq('Vim(call):E928: String required', exc_exec('call exepath('..input..')'))
+    end
+  end)
+
+  if iswin() then
+    it('append extension if omitted', function()
+      local filename = 'cmd'
+      local pathext = '.exe'
+      clear({env={PATHEXT=pathext}})
+      eq(call('exepath', filename..pathext), call('exepath', filename))
+    end)
+  end
 end)
diff --git a/test/functional/fixtures/bin/false b/test/functional/fixtures/bin/false
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/bin/false
diff --git a/test/functional/fixtures/bin/false.cmd b/test/functional/fixtures/bin/false.cmd
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/bin/false.cmd
diff --git a/test/functional/fixtures/bin/null b/test/functional/fixtures/bin/null
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/bin/null
diff --git a/test/functional/fixtures/bin/null.cmd b/test/functional/fixtures/bin/null.cmd
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/bin/null.cmd
diff --git a/test/functional/fixtures/bin/true b/test/functional/fixtures/bin/true
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/bin/true
diff --git a/test/functional/fixtures/bin/true.cmd b/test/functional/fixtures/bin/true.cmd
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/bin/true.cmd