diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-08-31 21:39:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 21:39:42 +0200 |
| commit | 0ade1bb7067d0cdb9b059fb66a8c4b868408be9c (patch) | |
| tree | 36c02a63f28bef74b6f8a3cf891267912867e193 /test/functional/shada | |
| parent | 7fd771619f2a2e2fe6007aaa6aa9a02cbdd205bd (diff) | |
| parent | 9ce81f7b2b90846063f6bd4a5ce8efc61e437983 (diff) | |
| download | rneovim-0ade1bb7067d0cdb9b059fb66a8c4b868408be9c.tar.gz rneovim-0ade1bb7067d0cdb9b059fb66a8c4b868408be9c.tar.bz2 rneovim-0ade1bb7067d0cdb9b059fb66a8c4b868408be9c.zip | |
Merge pull request #5225 from equalsraf/windows-functionaltests
Enable functional tests in Appveyor
Diffstat (limited to 'test/functional/shada')
| -rw-r--r-- | test/functional/shada/buffers_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/shada/helpers.lua | 2 | ||||
| -rw-r--r-- | test/functional/shada/marks_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/shada/shada_spec.lua | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua index e4d02c268b..6694e736dc 100644 --- a/test/functional/shada/buffers_spec.lua +++ b/test/functional/shada/buffers_spec.lua @@ -8,6 +8,8 @@ local reset, set_additional_cmd, clear = shada_helpers.reset, shada_helpers.set_additional_cmd, shada_helpers.clear +if helpers.pending_win32(pending) then return end + describe('ShaDa support code', function() local testfilename = 'Xtestfile-functional-shada-buffers' local testfilename_2 = 'Xtestfile-functional-shada-buffers-2' diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua index bb2919d4fb..cde555f0a7 100644 --- a/test/functional/shada/helpers.lua +++ b/test/functional/shada/helpers.lua @@ -5,7 +5,7 @@ local write_file, merge_args = helpers.write_file, helpers.merge_args local mpack = require('mpack') -local tmpname = os.tmpname() +local tmpname = helpers.tmpname() local additional_cmd = '' local function nvim_argv() diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua index ace3c74a62..646b0b692e 100644 --- a/test/functional/shada/marks_spec.lua +++ b/test/functional/shada/marks_spec.lua @@ -14,6 +14,8 @@ local nvim_current_line = function() return curwinmeths.get_cursor()[1] end +if helpers.pending_win32(pending) then return end + describe('ShaDa support code', function() local testfilename = 'Xtestfile-functional-shada-marks' local testfilename_2 = 'Xtestfile-functional-shada-marks-2' diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua index 32e7b16fc5..f6f3a8f826 100644 --- a/test/functional/shada/shada_spec.lua +++ b/test/functional/shada/shada_spec.lua @@ -18,6 +18,8 @@ local read_shada_file = shada_helpers.read_shada_file local wshada, _, shada_fname, clean = get_shada_rw('Xtest-functional-shada-shada.shada') +if helpers.pending_win32(pending) then return end + describe('ShaDa support code', function() before_each(reset) after_each(function() |