aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliseo Martínez <eliseomarmol@gmail.com>2014-11-21 22:08:16 +0100
committerEliseo Martínez <eliseomarmol@gmail.com>2014-11-21 22:08:16 +0100
commit1f2c197ebe40076fad2f5abecad4e73291fe0a9b (patch)
tree80f1a21700f81949594d8cb1d64c9b732c548302
parentaf5eaf22c529205ea75665df4a917b9294419f12 (diff)
downloadrneovim-1f2c197ebe40076fad2f5abecad4e73291fe0a9b.tar.gz
rneovim-1f2c197ebe40076fad2f5abecad4e73291fe0a9b.tar.bz2
rneovim-1f2c197ebe40076fad2f5abecad4e73291fe0a9b.zip
Fix functional-test-105 failure in OSX.
See https://github.com/neovim/neovim/issues/1519 for failure report. Cause : In OSX, /tmp is a symbolic link to /private/tmp, which causes expected and got results different because of implicit resolution. Solution : Resolve path before setting expected value.
-rw-r--r--test/functional/legacy/105_filename_modifiers_spec.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/legacy/105_filename_modifiers_spec.lua b/test/functional/legacy/105_filename_modifiers_spec.lua
index 32fa6ac7eb..3b417a88eb 100644
--- a/test/functional/legacy/105_filename_modifiers_spec.lua
+++ b/test/functional/legacy/105_filename_modifiers_spec.lua
@@ -8,7 +8,9 @@ describe('filename modifiers', function()
setup(clear)
it('is working', function()
- execute('cd /tmp')
+ local tmpdir = helpers.nvim('eval', 'resolve("/tmp")')
+
+ execute('cd ' .. tmpdir)
execute([=[set shell=sh]=])
execute([=[set shellslash]=])
execute([=[let tab="\t"]=])
@@ -62,7 +64,7 @@ describe('filename modifiers', function()
fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar'
fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2'
fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc'
- substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') '/tmp/abc.fb2'
+ substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') ']=] .. tmpdir .. [=[/abc.fb2'
fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz'
fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz'
fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz'