From cc903210c9e276b34f60f0af25ba9d15f9a55370 Mon Sep 17 00:00:00 2001 From: erw7 Date: Sat, 17 Aug 2019 13:46:01 +0900 Subject: Fix test failure on Windows [skip travis] --- src/nvim/testdir/shared.vim | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/shared.vim') diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index ab0a4fd706..2169fbc4db 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -202,9 +202,17 @@ endfunc func GetVimProg() if empty($NVIM_TEST_ARG0) " Assume the script was sourced instead of running "make". - return '../../../build/bin/nvim' + if has('win32') + return '..\\..\\..\\build\\bin\\nvim.exe' + else + return '../../../build/bin/nvim' + endif + endif + if has('win32') + return substitute($NVIM_TEST_ARG0, '/', '\\', 'g') + else + return $NVIM_TEST_ARG0 endif - return $NVIM_TEST_ARG0 endfunc " Get the command to run Vim, with -u NONE and --headless arguments. -- cgit From 3453a2ccb07f7de4f0160b906a70a72ded89ca14 Mon Sep 17 00:00:00 2001 From: erw7 Date: Sun, 18 Aug 2019 10:54:48 +0900 Subject: Change to use v:progpath instead of constant [skip ci] --- src/nvim/testdir/shared.vim | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/nvim/testdir/shared.vim') diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index 2169fbc4db..bcd6d021a0 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -202,11 +202,7 @@ endfunc func GetVimProg() if empty($NVIM_TEST_ARG0) " Assume the script was sourced instead of running "make". - if has('win32') - return '..\\..\\..\\build\\bin\\nvim.exe' - else - return '../../../build/bin/nvim' - endif + return v:progpath endif if has('win32') return substitute($NVIM_TEST_ARG0, '/', '\\', 'g') -- cgit