3 files changed, 50 insertions, 31 deletions
diff --git a/src/nvim/testdir/test97.in b/src/nvim/testdir/test97.in
deleted file mode 100644
index d4ff6d9295..0000000000
--- a/src/nvim/testdir/test97.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Test whether glob()/globpath() return correct results with certain escaped
-characters.
-
-STARTTEST
-:so small.vim
-:" make sure glob() doesn't use the shell
-:set shell=doesnotexist
-:" consistent sorting of file names
-:set nofileignorecase
-:e test.out
-:$put =glob('Xxx\{')
-:$put =glob('Xxx\$')
-:w! Xxx{
-:w! Xxx\$
-:$put =glob('Xxx\{')
-:$put =glob('Xxx\$')
-:"
-:$put =string(globpath('sautest/autoload', '*.vim'))
-:$put =string(globpath('sautest/autoload', '*.vim', 0, 1))
-:w
-:qa!
-ENDTEST
-
diff --git a/src/nvim/testdir/test97.ok b/src/nvim/testdir/test97.ok
deleted file mode 100644
index 32cdcbf1be..0000000000
--- a/src/nvim/testdir/test97.ok
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-Xxx{
-Xxx$
-'sautest/autoload/Test104.vim
-sautest/autoload/footest.vim'
-['sautest/autoload/Test104.vim', 'sautest/autoload/footest.vim']
diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
new file mode 100644
index 0000000000..84f26478ac
--- /dev/null
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -0,0 +1,50 @@
+-- vim: set foldmethod=marker foldmarker=[[,]] :
+-- Test whether glob()/globpath() return correct results with certain escaped
+-- characters.
+
+local helpers = require('test.functional.helpers')
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local execute, expect = helpers.execute, helpers.expect
+
+describe('glob() and globpath()', function()
+  setup(clear)
+
+  setup(function()
+    os.execute("mkdir -p sautest/autoload")
+    os.execute("touch sautest/autoload/Test104.vim")
+    os.execute("touch sautest/autoload/footest.vim")
+  end)
+
+  it('is working', function()
+    -- Make sure glob() doesn't use the shell
+    execute('set shell=doesnotexist')
+
+    -- Consistent sorting of file names
+    execute('set nofileignorecase')
+
+    execute([[$put =glob('Xxx\{')]])
+    execute([[$put =glob('Xxx\$')]])
+
+    execute('w! Xxx{')
+    execute([[w! Xxx\$]])
+    execute([[$put =glob('Xxx\{')]])
+    execute([[$put =glob('Xxx\$')]])
+
+    execute("$put =string(globpath('sautest/autoload', '*.vim'))")
+    execute("$put =string(globpath('sautest/autoload', '*.vim', 0, 1))")
+
+    expect([=[
+      
+      
+      
+      Xxx{
+      Xxx$
+      'sautest/autoload/Test104.vim
+      sautest/autoload/footest.vim'
+      ['sautest/autoload/Test104.vim', 'sautest/autoload/footest.vim']]=])
+  end)
+
+  teardown(function()
+    os.execute("rm -rf sautest Xxx{ Xxx$")
+  end)
+end)