Merge branch 'master' into s-dash-stdin

1 files changed, 50 insertions, 20 deletions

diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
index 6b63a317f1..907f0665ae 100644
--- a/test/functional/legacy/097_glob_path_spec.lua
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -6,15 +6,19 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local command, expect = helpers.command, helpers.expect
 
-if helpers.pending_win32(pending) then return end
-
 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")
+    if helpers.iswin() then
+      os.execute("md sautest\\autoload")
+      os.execute(".>sautest\\autoload\\Test104.vim 2>nul")
+      os.execute(".>sautest\\autoload\\footest.vim 2>nul")
+    else
+      os.execute("mkdir -p sautest/autoload")
+      os.execute("touch sautest/autoload/Test104.vim")
+      os.execute("touch sautest/autoload/footest.vim")
+    end
   end)
 
   it('is working', function()
@@ -24,29 +28,55 @@ describe('glob() and globpath()', function()
     -- Consistent sorting of file names
     command('set nofileignorecase')
 
-    command([[$put =glob('Xxx\{')]])
-    command([[$put =glob('Xxx\$')]])
+    if helpers.iswin() then
+      command([[$put =glob('Xxx{')]])
+      command([[$put =glob('Xxx$')]])
+
+      command('silent w! Xxx{')
+      command([[w! Xxx$]])
+      command([[$put =glob('Xxx{')]])
+      command([[$put =glob('Xxx$')]])
+
+      command([[$put =string(globpath('sautest\autoload', '*.vim'))]])
+      command([[$put =string(globpath('sautest\autoload', '*.vim', 0, 1))]])
+      expect([=[
+
+
 
-    command('silent w! Xxx{')
-    command([[w! Xxx\$]])
-    command([[$put =glob('Xxx\{')]])
-    command([[$put =glob('Xxx\$')]])
+        Xxx{
+        Xxx$
+        'sautest\autoload\Test104.vim
+        sautest\autoload\footest.vim'
+        ['sautest\autoload\Test104.vim', 'sautest\autoload\footest.vim']]=])
+    else
+      command([[$put =glob('Xxx\{')]])
+      command([[$put =glob('Xxx\$')]])
 
-    command("$put =string(globpath('sautest/autoload', '*.vim'))")
-    command("$put =string(globpath('sautest/autoload', '*.vim', 0, 1))")
+      command('silent w! Xxx{')
+      command([[w! Xxx\$]])
+      command([[$put =glob('Xxx\{')]])
+      command([[$put =glob('Xxx\$')]])
 
-    expect([=[
+      command("$put =string(globpath('sautest/autoload', '*.vim'))")
+      command("$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']]=])
+        Xxx{
+        Xxx$
+        'sautest/autoload/Test104.vim
+        sautest/autoload/footest.vim'
+        ['sautest/autoload/Test104.vim', 'sautest/autoload/footest.vim']]=])
+    end
   end)
 
   teardown(function()
-    os.execute("rm -rf sautest Xxx{ Xxx$")
+    if helpers.iswin() then
+      os.execute('del /q/f Xxx{ Xxx$')
+      os.execute('rd /q sautest')
+    else
+      os.execute("rm -rf sautest Xxx{ Xxx$")
+    end
   end)
 end)