diff options
| author | ashleyh <gh@ashleyh.eu> | 2014-02-26 22:10:25 +0000 |
|---|---|---|
| committer | ashleyh <gh@ashleyh.eu> | 2014-02-26 22:10:25 +0000 |
| commit | 00ba300d3941d5e9d59ffffcb760eb0f9d1079ef (patch) | |
| tree | 2b22d404b040adf2441af3b8369db44b800ac5ab /src/testdir | |
| parent | 14cbd618ec4930878afc6f9073d9ebb9e514fd75 (diff) | |
| parent | 314791dca7b80e167165694222dfc0f70dd77e5c (diff) | |
| download | rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.tar.gz rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.tar.bz2 rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.zip | |
Merge branch 'master' into pr36
Conflicts:
README.md
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/testdir/test49.vim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 5238fda86a..16db2846c2 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -2,7 +2,7 @@ # Makefile to run all tests for Vim # -VIMPROG = ../../build/src/vim +VIMPROG = ../../build/bin/nvim # Uncomment this line to use valgrind for memory leaks and extra warnings. # The output goes into a file "valgrind.testN" diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim index eaf0cba00b..21c2a0c582 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -456,7 +456,7 @@ function! ExtraVim(...) " messing up the user's viminfo file. let redirect = a:0 ? \ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : "" - exec "!echo '" . debug_quits . "q' | ../../build/src/vim -u NONE -N -Xes" . redirect . + exec "!echo '" . debug_quits . "q' | ../../build/bin/nvim -u NONE -N -Xes" . redirect . \ " -c 'debuggreedy|set viminfo+=nviminfo'" . \ " -c 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . |