mirror of
https://github.com/vim/vim.git
synced 2025-10-03 05:14:07 -04:00
patch 8.2.4027: import test fails on MS-Windows
Problem: Import test fails on MS-Windows. Solution: Use a different directory name.
This commit is contained in:
@@ -1573,33 +1573,33 @@ def Test_import_fails()
|
|||||||
END
|
END
|
||||||
CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself'])
|
CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself'])
|
||||||
|
|
||||||
mkdir('Xdir')
|
mkdir('Ximport')
|
||||||
|
|
||||||
writefile(['vim9script'], 'Xdir/.vim')
|
writefile(['vim9script'], 'Ximport/.vim')
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
vim9script
|
vim9script
|
||||||
import './Xdir/.vim'
|
import './Ximport/.vim'
|
||||||
END
|
END
|
||||||
CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"')
|
CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"')
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
vim9script
|
vim9script
|
||||||
import './Xdir/.vim' as vim
|
import './Ximport/.vim' as vim
|
||||||
END
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
|
|
||||||
writefile(['vim9script'], 'Xdir/.vimrc')
|
writefile(['vim9script'], 'Ximport/.vimrc')
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
vim9script
|
vim9script
|
||||||
import './Xdir/.vimrc'
|
import './Ximport/.vimrc'
|
||||||
END
|
END
|
||||||
CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim')
|
CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim')
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
vim9script
|
vim9script
|
||||||
import './Xdir/.vimrc' as vimrc
|
import './Ximport/.vimrc' as vimrc
|
||||||
END
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckScriptSuccess(lines)
|
||||||
|
|
||||||
delete('Xdir', 'rf')
|
delete('Ximport', 'rf')
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
func g:Trigger()
|
func g:Trigger()
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
4027,
|
||||||
/**/
|
/**/
|
||||||
4026,
|
4026,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user