17 files changed, 35 insertions, 9 deletions
diff --git a/test/functional/legacy/011_autocommands_spec.lua b/test/functional/legacy/011_autocommands_spec.lua
index 6e613c85df..ba899f8119 100644
--- a/test/functional/legacy/011_autocommands_spec.lua
+++ b/test/functional/legacy/011_autocommands_spec.lua
@@ -18,6 +18,8 @@ local clear, execute, expect, eq, neq, dedent, write_file, feed =
   helpers.clear, helpers.execute, helpers.expect, helpers.eq, helpers.neq,
   helpers.dedent, helpers.write_file, helpers.feed
 
+if helpers.pending_win32(pending) then return end
+
 local function has_gzip()
   return os.execute('gzip --help >/dev/null 2>&1') == 0
 end
diff --git a/test/functional/legacy/025_jump_tag_hidden_spec.lua b/test/functional/legacy/025_jump_tag_hidden_spec.lua
index 7b7ddb07b9..99224f9e08 100644
--- a/test/functional/legacy/025_jump_tag_hidden_spec.lua
+++ b/test/functional/legacy/025_jump_tag_hidden_spec.lua
@@ -5,6 +5,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('jump to a tag with hidden set', function()
   setup(clear)
 
diff --git a/test/functional/legacy/030_fileformats_spec.lua b/test/functional/legacy/030_fileformats_spec.lua
index 9bc62a375e..5fd78b2c59 100644
--- a/test/functional/legacy/030_fileformats_spec.lua
+++ b/test/functional/legacy/030_fileformats_spec.lua
@@ -4,6 +4,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local feed, clear, execute = helpers.feed, helpers.clear, helpers.execute
 local eq, write_file = helpers.eq, helpers.write_file
 
+if helpers.pending_win32(pending) then return end
+
 describe('fileformats option', function()
   setup(function()
     clear()
diff --git a/test/functional/legacy/036_regexp_character_classes_spec.lua b/test/functional/legacy/036_regexp_character_classes_spec.lua
index 9e67bb9429..15287b9901 100644
--- a/test/functional/legacy/036_regexp_character_classes_spec.lua
+++ b/test/functional/legacy/036_regexp_character_classes_spec.lua
@@ -3,7 +3,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local source, write_file = helpers.source, helpers.write_file
-local os_name = helpers.os_name
 
 local function sixlines(text)
     local result = ''
@@ -14,19 +13,16 @@ local function sixlines(text)
 end
 
 local function diff(text, nodedent)
-  local tmpname = os.tmpname()
-  if os_name() == 'osx' and string.match(tmpname, '^/tmp') then
-   tmpname = '/private'..tmpname
-  end
-  execute('w! '..tmpname)
+  local fname = helpers.tmpname()
+  execute('w! '..fname)
   helpers.wait()
-  local data = io.open(tmpname):read('*all')
+  local data = io.open(fname):read('*all')
   if nodedent then
     helpers.eq(text, data)
   else
     helpers.eq(helpers.dedent(text), data)
   end
-  os.remove(tmpname)
+  os.remove(fname)
 end
 
 describe('character classes in regexp', function()
diff --git a/test/functional/legacy/051_highlight_spec.lua b/test/functional/legacy/051_highlight_spec.lua
index 5bf3b51b90..ef392d8c67 100644
--- a/test/functional/legacy/051_highlight_spec.lua
+++ b/test/functional/legacy/051_highlight_spec.lua
@@ -7,6 +7,8 @@ local clear, feed = helpers.clear, helpers.feed
 local execute, expect = helpers.execute, helpers.expect
 local wait = helpers.wait
 
+if helpers.pending_win32(pending) then return end
+
 describe(':highlight', function()
   setup(clear)
 
diff --git a/test/functional/legacy/059_utf8_spell_checking_spec.lua b/test/functional/legacy/059_utf8_spell_checking_spec.lua
index c44ab44b3c..2fb8f3557d 100644
--- a/test/functional/legacy/059_utf8_spell_checking_spec.lua
+++ b/test/functional/legacy/059_utf8_spell_checking_spec.lua
@@ -5,6 +5,8 @@ local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local write_file, call = helpers.write_file, helpers.call
 
+if helpers.pending_win32(pending) then return end
+
 local function write_latin1(name, text)
   text = call('iconv', text, 'utf-8', 'latin-1')
   write_file(name, text)
diff --git a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
index 719ce25099..40be7dcca4 100644
--- a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
+++ b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
@@ -7,6 +7,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('store cursor position in session file in Latin-1', function()
   setup(clear)
 
diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
index a6c146891a..23f1427cb5 100644
--- a/test/functional/legacy/097_glob_path_spec.lua
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -6,6 +6,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('glob() and globpath()', function()
   setup(clear)
 
diff --git a/test/functional/legacy/107_adjust_window_and_contents_spec.lua b/test/functional/legacy/107_adjust_window_and_contents_spec.lua
index ce8d967e00..610bac7f21 100644
--- a/test/functional/legacy/107_adjust_window_and_contents_spec.lua
+++ b/test/functional/legacy/107_adjust_window_and_contents_spec.lua
@@ -5,6 +5,8 @@ local Screen = require('test.functional.ui.screen')
 local insert = helpers.insert
 local clear, execute = helpers.clear, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('107', function()
   setup(clear)
 
diff --git a/test/functional/legacy/arglist_spec.lua b/test/functional/legacy/arglist_spec.lua
index c128aaf115..b86d3f0aea 100644
--- a/test/functional/legacy/arglist_spec.lua
+++ b/test/functional/legacy/arglist_spec.lua
@@ -4,6 +4,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, eq = helpers.clear, helpers.execute, helpers.eq
 local eval, exc_exec, neq = helpers.eval, helpers.exc_exec, helpers.neq
 
+if helpers.pending_win32(pending) then return end
+
 describe('argument list commands', function()
   before_each(clear)
 
diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua
index 42238b3a9e..cd19e31a79 100644
--- a/test/functional/legacy/delete_spec.lua
+++ b/test/functional/legacy/delete_spec.lua
@@ -2,6 +2,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
 local eq, eval, execute = helpers.eq, helpers.eval, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('Test for delete()', function()
   before_each(clear)
 
diff --git a/test/functional/legacy/file_perm_spec.lua b/test/functional/legacy/file_perm_spec.lua
index 9ebbfd25e4..77e82352c5 100644
--- a/test/functional/legacy/file_perm_spec.lua
+++ b/test/functional/legacy/file_perm_spec.lua
@@ -6,7 +6,7 @@ local clear, call, eq = helpers.clear, helpers.call, helpers.eq
 local neq, exc_exec = helpers.neq, helpers.exc_exec
 
 describe('Test getting and setting file permissions', function()
-  local tempfile = os.tmpname()
+  local tempfile = helpers.tmpname()
 
   before_each(function()
     os.remove(tempfile)
diff --git a/test/functional/legacy/fixeol_spec.lua b/test/functional/legacy/fixeol_spec.lua
index bba1415535..1e9e832536 100644
--- a/test/functional/legacy/fixeol_spec.lua
+++ b/test/functional/legacy/fixeol_spec.lua
@@ -4,6 +4,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local feed = helpers.feed
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('fixeol', function()
   local function rmtestfiles()
     os.remove('test.out')
diff --git a/test/functional/legacy/fnamemodify_spec.lua b/test/functional/legacy/fnamemodify_spec.lua
index f614b07b36..d8ecbfe058 100644
--- a/test/functional/legacy/fnamemodify_spec.lua
+++ b/test/functional/legacy/fnamemodify_spec.lua
@@ -4,6 +4,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
 local call, eq, nvim = helpers.call, helpers.eq, helpers.meths
 
+if helpers.pending_win32(pending) then return end
+
 local function expected_empty()
   eq({}, nvim.get_vvar('errors'))
 end
diff --git a/test/functional/legacy/getcwd_spec.lua b/test/functional/legacy/getcwd_spec.lua
index 3bb9930b74..dcb56eb242 100644
--- a/test/functional/legacy/getcwd_spec.lua
+++ b/test/functional/legacy/getcwd_spec.lua
@@ -4,6 +4,8 @@ local helpers = require('test.functional.helpers')(after_each)
 local eq, eval, source = helpers.eq, helpers.eval, helpers.source
 local call, clear, execute = helpers.call, helpers.clear, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('getcwd', function()
   before_each(clear)
 
diff --git a/test/functional/legacy/packadd_spec.lua b/test/functional/legacy/packadd_spec.lua
index a6979d8eb2..68bdbf5257 100644
--- a/test/functional/legacy/packadd_spec.lua
+++ b/test/functional/legacy/packadd_spec.lua
@@ -9,6 +9,8 @@ local function expected_empty()
   eq({}, nvim.get_vvar('errors'))
 end
 
+if helpers.pending_win32(pending) then return end
+
 describe('packadd', function()
   before_each(function()
     clear()
diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua
index 300a777772..171ec3de92 100644
--- a/test/functional/legacy/wordcount_spec.lua
+++ b/test/functional/legacy/wordcount_spec.lua
@@ -5,6 +5,8 @@ local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute = helpers.clear, helpers.execute
 local eq, eval = helpers.eq, helpers.eval
 
+if helpers.pending_win32(pending) then return end
+
 describe('wordcount', function()
   before_each(clear)