Patch 9.0.0324

[Bram Moolenaar]

Patch 9.0.0324 (after 9.0.0323)
Problem: MS-Windows: resolve() test fails.
Solution: Revert renaming the directory.
Files: src/testdir/test_functions.vim


*** ../vim-9.0.0323/src/testdir/test_functions.vim 2022-08-29 22:31:15.919685279 +0100
--- src/testdir/test_functions.vim 2022-08-29 22:48:58.701227010 +0100
***************
*** 375,396 ****

" test for shortcut file
if executable('cscript')
! new Xresfile
wq
let lines =<< trim END
Set fs = CreateObject("Scripting.FileSystemObject")
Set ws = WScript.CreateObject("WScript.Shell")
Set shortcut = ws.CreateShortcut("Xlink.lnk")
! shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xresfile")
shortcut.Save
END
call writefile(lines, 'link.vbs')
silent !cscript link.vbs
call delete('link.vbs')
! call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk')))
! call delete('Xresfile')

! call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk')))
call delete('Xlink.lnk')
else
echomsg 'skipped test for shortcut file'
--- 375,396 ----

" test for shortcut file
if executable('cscript')
! new Xfile
wq
let lines =<< trim END
Set fs = CreateObject("Scripting.FileSystemObject")
Set ws = WScript.CreateObject("WScript.Shell")
Set shortcut = ws.CreateShortcut("Xlink.lnk")
! shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")
shortcut.Save
END
call writefile(lines, 'link.vbs')
silent !cscript link.vbs
call delete('link.vbs')
! call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
! call delete('Xfile')

! call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
call delete('Xlink.lnk')
else
echomsg 'skipped test for shortcut file'
***************
*** 398,448 ****

" remove files
call delete('Xlink')
! call delete('Xresfile')

" test for symbolic link to a file
! new Xslinkfile
wq
! call assert_equal('Xslinkfile', resolve('Xslinkfile'))
! silent !mklink Xlink Xslinkfile
if !v:shell_error
! call assert_equal(s:normalize_fname(getcwd() . '\Xslinkfile'), s:normalize_fname(resolve('./Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for symbolic link to a file'
endif
! call delete('Xslinkfile')

" test for junction to a directory
! call mkdir('Xjuncdir')
! silent !mklink /J Xlink Xjuncdir
if !v:shell_error
! call assert_equal(s:normalize_fname(getcwd() . '\Xjuncdir'), s:normalize_fname(resolve(getcwd() . '/Xlink')))

! call delete('Xjuncdir', 'd')

" test for junction already removed
call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for junction to a directory'
! call delete('Xjuncdir', 'd')
endif

" test for symbolic link to a directory
! call mkdir('Xjuncdir')
! silent !mklink /D Xlink Xjuncdir
if !v:shell_error
! call assert_equal(s:normalize_fname(getcwd() . '\Xjuncdir'), s:normalize_fname(resolve(getcwd() . '/Xlink')))

! call delete('Xjuncdir', 'd')

" test for symbolic link already removed
call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for symbolic link to a directory'
! call delete('Xjuncdir', 'd')
endif

" test for buffer name
--- 398,449 ----

" remove files
call delete('Xlink')
! call delete('Xdir', 'd')
! call delete('Xfile')

" test for symbolic link to a file
! new Xfile
wq
! call assert_equal('Xfile', resolve('Xfile'))
! silent !mklink Xlink Xfile
if !v:shell_error
! call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for symbolic link to a file'
endif
! call delete('Xfile')

" test for junction to a directory
! call mkdir('Xdir')
! silent !mklink /J Xlink Xdir
if !v:shell_error
! call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve(getcwd() . '/Xlink')))

! call delete('Xdir', 'd')

" test for junction already removed
call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for junction to a directory'
! call delete('Xdir', 'd')
endif

" test for symbolic link to a directory
! call mkdir('Xdir')
! silent !mklink /D Xlink Xdir
if !v:shell_error
! call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve(getcwd() . '/Xlink')))

! call delete('Xdir', 'd')

" test for symbolic link already removed
call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for symbolic link to a directory'
! call delete('Xdir', 'd')
endif

" test for buffer name
***************
*** 460,479 ****
call delete('Xfile')

" test for reparse point
! call mkdir('Xparsedir')
! call assert_equal('Xdir', resolve('Xparsedir'))
! silent !mklink /D Xdirlink Xparsedir
if !v:shell_error
! w Xparsedir/text.txt
! call assert_equal('Xparsedir/text.txt', resolve('Xparsedir/text.txt'))
! call assert_equal(s:normalize_fname(getcwd() . '\Xparsedir\text.txt'), s:normalize_fname(resolve('Xdirlink\text.txt')))
! call assert_equal(s:normalize_fname(getcwd() . '\Xparsedir'), s:normalize_fname(resolve('Xdirlink')))
call delete('Xdirlink')
else
echomsg 'skipped test for reparse point'
endif

! call delete('Xparsedir', 'rf')
endfunc

func Test_simplify()
--- 461,480 ----
call delete('Xfile')

" test for reparse point
! call mkdir('Xdir')
! call assert_equal('Xdir', resolve('Xdir'))
! silent !mklink /D Xdirlink Xdir
if !v:shell_error
! w Xdir/text.txt
! call assert_equal('Xdir/text.txt', resolve('Xdir/text.txt'))
! call assert_equal(s:normalize_fname(getcwd() . '\Xdir\text.txt'), s:normalize_fname(resolve('Xdirlink\text.txt')))
! call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve('Xdirlink')))
call delete('Xdirlink')
else
echomsg 'skipped test for reparse point'
endif

! call delete('Xdir', 'rf')
endfunc

func Test_simplify()
*** ../vim-9.0.0323/src/version.c 2022-08-29 22:31:15.923685244 +0100
--- src/version.c 2022-08-29 22:51:05.768652967 +0100
***************
*** 709,710 ****
--- 709,712 ----
{ /* Add new patch number below this line */
+ /**/
+ 324,
/**/

--
System administrators are just like women: You can't live with them and you
can't live without them.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///