From e5aeb2e193301a645b794346e07897092af540d1 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 8 Feb 2020 18:02:26 -0500 Subject: vim-patch:8.1.2129: using hard coded executable path in test Problem: Using hard coded executable path in test. Solution: Use v:progpath. Use $VIMRUNTIME instead of "runtime". (James McCoy, closes vim/vim#5025) https://github.com/vim/vim/commit/1ac41a5c1352306942344777d2ba86dccd84ffad --- src/nvim/testdir/test_spell.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/nvim/testdir/test_spell.vim') diff --git a/src/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim index 94789d6ea3..7d33ab9054 100644 --- a/src/nvim/testdir/test_spell.vim +++ b/src/nvim/testdir/test_spell.vim @@ -132,18 +132,18 @@ func Test_spellinfo() new set enc=latin1 spell spelllang=en - call assert_match("^\nfile: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set enc=cp1250 spell spelllang=en - call assert_match("^\nfile: .*/runtime/spell/en.ascii.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo')) set enc=utf-8 spell spelllang=en - call assert_match("^\nfile: .*/runtime/spell/en.utf-8.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) set enc=latin1 spell spelllang=en_us,en_nz call assert_match("^\n" . - \ "file: .*/runtime/spell/en.latin1.spl\n" . - \ "file: .*/runtime/spell/en.latin1.spl\n$", execute('spellinfo')) + \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . + \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') -- cgit From e52c22d63c4e83fb2fe3760dede191b6b70cb2d2 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 8 Feb 2020 18:20:28 -0500 Subject: vim-patch:8.1.2131: MSVC tests fail Problem: MSVC tests fail. Solution: Replace backslashes with slashes. https://github.com/vim/vim/commit/c25e702deec74771e49f6c2df4cda7a1f97d0c1e --- src/nvim/testdir/test_spell.vim | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/nvim/testdir/test_spell.vim') diff --git a/src/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim index 7d33ab9054..e5eaa01e92 100644 --- a/src/nvim/testdir/test_spell.vim +++ b/src/nvim/testdir/test_spell.vim @@ -130,20 +130,21 @@ endfunc func Test_spellinfo() throw 'skipped: Nvim does not support enc=latin1' new + let runtime = substitute($VIMRUNTIME, '\\', '/', 'g') set enc=latin1 spell spelllang=en - call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. runtime .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set enc=cp1250 spell spelllang=en - call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.ascii.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. runtime .. "/spell/en.ascii.spl\n$", execute('spellinfo')) set enc=utf-8 spell spelllang=en - call assert_match("^\nfile: " .. $VIMRUNTIME .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) + call assert_match("^\nfile: " .. runtime .. "/spell/en.utf-8.spl\n$", execute('spellinfo')) set enc=latin1 spell spelllang=en_us,en_nz call assert_match("^\n" . - \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n" . - \ "file: " .. $VIMRUNTIME .. "/spell/en.latin1.spl\n$", execute('spellinfo')) + \ "file: " .. runtime .. "/spell/en.latin1.spl\n" . + \ "file: " .. runtime .. "/spell/en.latin1.spl\n$", execute('spellinfo')) set spell spelllang= call assert_fails('spellinfo', 'E756:') -- cgit