Mercurial > vim

comparison src/testdir/test_functions.vim @ 29972:85f4350627a7 v9.0.0324

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0324: MS-Windows: resolve() test fails Commit: https://github.com/vim/vim/commit/15cae5c9ca3d2dc0b2c9ac29d27c4ba765362ab5 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 29 22:51:38 2022 +0100 patch 9.0.0324: MS-Windows: resolve() test fails Problem: MS-Windows: resolve() test fails. Solution: Revert renaming the directory.
author Bram Moolenaar <Bram@vim.org>
date Tue, 30 Aug 2022 00:00:04 +0200
parents d891115c0aea
children 86eb4aba16c3
comparison
equal deleted inserted replaced
29971:deea43757ab2 29972:85f4350627a7
373 func Test_resolve_win32() 373 func Test_resolve_win32()
374 CheckMSWindows 374 CheckMSWindows
375 375
376 " test for shortcut file 376 " test for shortcut file
377 if executable('cscript') 377 if executable('cscript')
378 new Xresfile 378 new Xfile
379 wq 379 wq
380 let lines =<< trim END 380 let lines =<< trim END
381 Set fs = CreateObject("Scripting.FileSystemObject") 381 Set fs = CreateObject("Scripting.FileSystemObject")
382 Set ws = WScript.CreateObject("WScript.Shell") 382 Set ws = WScript.CreateObject("WScript.Shell")
383 Set shortcut = ws.CreateShortcut("Xlink.lnk") 383 Set shortcut = ws.CreateShortcut("Xlink.lnk")
384 shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xresfile") 384 shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")
385 shortcut.Save 385 shortcut.Save
386 END 386 END
387 call writefile(lines, 'link.vbs') 387 call writefile(lines, 'link.vbs')
388 silent !cscript link.vbs 388 silent !cscript link.vbs
389 call delete('link.vbs') 389 call delete('link.vbs')
390 call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk'))) 390 call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
391 call delete('Xresfile') 391 call delete('Xfile')
392 392
393 call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk'))) 393 call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
394 call delete('Xlink.lnk') 394 call delete('Xlink.lnk')
395 else 395 else
396 echomsg 'skipped test for shortcut file' 396 echomsg 'skipped test for shortcut file'
397 endif 397 endif
398 398
399 " remove files 399 " remove files
400 call delete('Xlink') 400 call delete('Xlink')
401 call delete('Xresfile') 401 call delete('Xdir', 'd')
402 call delete('Xfile')
402 403
403 " test for symbolic link to a file 404 " test for symbolic link to a file
404 new Xslinkfile 405 new Xfile
405 wq 406 wq
406 call assert_equal('Xslinkfile', resolve('Xslinkfile')) 407 call assert_equal('Xfile', resolve('Xfile'))
407 silent !mklink Xlink Xslinkfile 408 silent !mklink Xlink Xfile
408 if !v:shell_error 409 if !v:shell_error
409 call assert_equal(s:normalize_fname(getcwd() . '\Xslinkfile'), s:normalize_fname(resolve('./Xlink'))) 410 call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink')))
410 call delete('Xlink') 411 call delete('Xlink')
411 else 412 else
412 echomsg 'skipped test for symbolic link to a file' 413 echomsg 'skipped test for symbolic link to a file'
413 endif 414 endif
414 call delete('Xslinkfile') 415 call delete('Xfile')
415 416
416 " test for junction to a directory 417 " test for junction to a directory
417 call mkdir('Xjuncdir') 418 call mkdir('Xdir')
418 silent !mklink /J Xlink Xjuncdir 419 silent !mklink /J Xlink Xdir
419 if !v:shell_error 420 if !v:shell_error
420 call assert_equal(s:normalize_fname(getcwd() . '\Xjuncdir'), s:normalize_fname(resolve(getcwd() . '/Xlink'))) 421 call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
421 422
422 call delete('Xjuncdir', 'd') 423 call delete('Xdir', 'd')
423 424
424 " test for junction already removed 425 " test for junction already removed
425 call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink'))) 426 call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
426 call delete('Xlink') 427 call delete('Xlink')
427 else 428 else
428 echomsg 'skipped test for junction to a directory' 429 echomsg 'skipped test for junction to a directory'
429 call delete('Xjuncdir', 'd') 430 call delete('Xdir', 'd')
430 endif 431 endif
431 432
432 " test for symbolic link to a directory 433 " test for symbolic link to a directory
433 call mkdir('Xjuncdir') 434 call mkdir('Xdir')
434 silent !mklink /D Xlink Xjuncdir 435 silent !mklink /D Xlink Xdir
435 if !v:shell_error 436 if !v:shell_error
436 call assert_equal(s:normalize_fname(getcwd() . '\Xjuncdir'), s:normalize_fname(resolve(getcwd() . '/Xlink'))) 437 call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
437 438
438 call delete('Xjuncdir', 'd') 439 call delete('Xdir', 'd')
439 440
440 " test for symbolic link already removed 441 " test for symbolic link already removed
441 call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink'))) 442 call assert_equal(s:normalize_fname(getcwd() . '\Xlink'), s:normalize_fname(resolve(getcwd() . '/Xlink')))
442 call delete('Xlink') 443 call delete('Xlink')
443 else 444 else
444 echomsg 'skipped test for symbolic link to a directory' 445 echomsg 'skipped test for symbolic link to a directory'
445 call delete('Xjuncdir', 'd') 446 call delete('Xdir', 'd')
446 endif 447 endif
447 448
448 " test for buffer name 449 " test for buffer name
449 new Xfile 450 new Xfile
450 wq 451 wq
458 echomsg 'skipped test for buffer name' 459 echomsg 'skipped test for buffer name'
459 endif 460 endif
460 call delete('Xfile') 461 call delete('Xfile')
461 462
462 " test for reparse point 463 " test for reparse point
463 call mkdir('Xparsedir') 464 call mkdir('Xdir')
464 call assert_equal('Xdir', resolve('Xparsedir')) 465 call assert_equal('Xdir', resolve('Xdir'))
465 silent !mklink /D Xdirlink Xparsedir 466 silent !mklink /D Xdirlink Xdir
466 if !v:shell_error 467 if !v:shell_error
467 w Xparsedir/text.txt 468 w Xdir/text.txt
468 call assert_equal('Xparsedir/text.txt', resolve('Xparsedir/text.txt')) 469 call assert_equal('Xdir/text.txt', resolve('Xdir/text.txt'))
469 call assert_equal(s:normalize_fname(getcwd() . '\Xparsedir\text.txt'), s:normalize_fname(resolve('Xdirlink\text.txt'))) 470 call assert_equal(s:normalize_fname(getcwd() . '\Xdir\text.txt'), s:normalize_fname(resolve('Xdirlink\text.txt')))
470 call assert_equal(s:normalize_fname(getcwd() . '\Xparsedir'), s:normalize_fname(resolve('Xdirlink'))) 471 call assert_equal(s:normalize_fname(getcwd() . '\Xdir'), s:normalize_fname(resolve('Xdirlink')))
471 call delete('Xdirlink') 472 call delete('Xdirlink')
472 else 473 else
473 echomsg 'skipped test for reparse point' 474 echomsg 'skipped test for reparse point'
474 endif 475 endif
475 476
476 call delete('Xparsedir', 'rf') 477 call delete('Xdir', 'rf')
477 endfunc 478 endfunc
478 479
479 func Test_simplify() 480 func Test_simplify()
480 call assert_equal('', simplify('')) 481 call assert_equal('', simplify(''))
481 call assert_equal('/', simplify('/')) 482 call assert_equal('/', simplify('/'))