diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-07 14:39:56 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-07 14:39:56 +0000 |
| commit | 2b04d5f1ef0dfaac1706e413947a7297285fa7b9 (patch) | |
| tree | 5444c73d96c18d3f438ae7983d2eb3b084b2768d | |
| parent | e664a327014f4aa8baf8549a34a4caab2f3116a3 (diff) | |
patch 8.2.4027: import test fails on MS-Windowsv8.2.4027
Problem: Import test fails on MS-Windows.
Solution: Use a different directory name.
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index f4d59fde82..faa26719df 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1573,33 +1573,33 @@ def Test_import_fails() END CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself']) - mkdir('Xdir') + mkdir('Ximport') - writefile(['vim9script'], 'Xdir/.vim') + writefile(['vim9script'], 'Ximport/.vim') lines =<< trim END vim9script - import './Xdir/.vim' + import './Ximport/.vim' END CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"') lines =<< trim END vim9script - import './Xdir/.vim' as vim + import './Ximport/.vim' as vim END CheckScriptSuccess(lines) - writefile(['vim9script'], 'Xdir/.vimrc') + writefile(['vim9script'], 'Ximport/.vimrc') lines =<< trim END vim9script - import './Xdir/.vimrc' + import './Ximport/.vimrc' END CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim') lines =<< trim END vim9script - import './Xdir/.vimrc' as vimrc + import './Ximport/.vimrc' as vimrc END CheckScriptSuccess(lines) - delete('Xdir', 'rf') + delete('Ximport', 'rf') enddef func g:Trigger() diff --git a/src/version.c b/src/version.c index 40c83bfb4a..731f8cef1d 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4027, +/**/ 4026, /**/ 4025, |