changeset 26996:83dcff9f3a9a v8.2.4027

patch 8.2.4027: import test fails on MS-Windows Commit: https://github.com/vim/vim/commit/2b04d5f1ef0dfaac1706e413947a7297285fa7b9 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 7 14:39:56 2022 +0000 patch 8.2.4027: import test fails on MS-Windows Problem: Import test fails on MS-Windows. Solution: Use a different directory name.
author Bram Moolenaar <Bram@vim.org>
date Fri, 07 Jan 2022 15:45:03 +0100
parents b36d27260f1d
children 5ab78ae37723
files src/testdir/test_vim9_script.vim src/version.c
diffstat 2 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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')
-
-  writefile(['vim9script'], 'Xdir/.vim')
+  mkdir('Ximport')
+
+  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()
--- 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,