thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1677: tests get stuck when running into an existing swapfile

Browse Source 
Problem:    Tests get stuck when running into an existing swapfile.
Solution:   Set v:swapchoice to "q" and report an error. (Daniel Hahler,
            closes #4644)
This commit is contained in:
Bram Moolenaar
2019-07-13 14:47:26 +02:00
parent 017c269938
commit b073da8929
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/runtest.vim
View File

@@ -68,10 +68,14 @@ set encoding=utf-8
let s:test_script_fname = expand('%') let s:test_script_fname = expand('%')
au! SwapExists * call HandleSwapExists() au! SwapExists * call HandleSwapExists()
func HandleSwapExists() func HandleSwapExists()
" Only ignore finding a swap file for the test script (the user might be " Ignore finding a swap file for the test script (the user might be
" editing it and do ":make test_name") and the output file. " editing it and do ":make test_name") and the output file.
" Report finding another swap file and chose 'q' to avoid getting stuck.
if expand('<afile>') == 'messages' || expand('<afile>') =~ s:test_script_fname if expand('<afile>') == 'messages' || expand('<afile>') =~ s:test_script_fname
let v:swapchoice = 'e' let v:swapchoice = 'e'
else
call assert_report('Unexpected swap file: ' .. v:swapname)
let v:swapchoice = 'q'
endif endif
endfunc endfunc

2
src/version.c
View File

@@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1677,
/**/ /**/
1676, 1676,
/**/ /**/