patch 9.1.2050: tests: Test_cd_completion may fail
Commit:
https://github.com/vim/vim/commit/6625ba359e33f8223d146f3ae87a880c446b5470
Author: Muraoka Taro <[email protected]>
Date: Sat Jan 3 23:44:35 2026 +0000
patch 9.1.2050: tests: Test_cd_completion may fail
Problem: tests: Test_cd_completion() may fail depending on the contents
of the root directory of the current drive on Windows.
readdir() may return a directory that cannot "cd" to, causing
this test to fail. An example of such a directory is
"System Volume Information" which only admin can "cd" to.
Solution: When determining the directory to use for testing, use the
directory that we actually "cd" to successfully.
In addition, directories with '$' in their names are also
excluded, as they are considered environment variables during
completion and do not work as expected.
Example: "$RECYCLE.BIN" (Muraoka Taro).
closes: #19078
Signed-off-by: Muraoka Taro <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/test_cd.vim b/src/testdir/test_cd.vim
index c12a73ac3..115688225 100644
--- a/src/testdir/test_cd.vim
+++ b/src/testdir/test_cd.vim
@@ -224,15 +224,42 @@ func Test_cd_completion()
if has('win32')
" Test Windows absolute path completion
+ let saved_cwd = getcwd()
+
" Retrieve a suitable dir in the current drive
- let dir = readdir('/', 'isdirectory("/" .. v:val) && len(v:val) > 2')[-1]
+ for d in readdir('/', 'isdirectory("/" .. v:val) && len(v:val) > 2')
+ " Paths containing '$' such as "$RECYCLE.BIN" are skipped because
+ " they are considered environment variables and completion does not
+ " work.
+ if d =~ '\V$'
+ continue
+ endif
+ " Skip directories that we don't have permission to "cd" into by
+ " actually "cd"ing into them and making sure they don't fail.
+ " Directory "System Volume Information" is an example of this.
+ try
+ call chdir('/' .. d)
+ let dir = d
+ " Yay! We found a suitable dir!
+ break
+ catch /:E472:/
+ " Just skip directories where "cd" fails
+ continue
+ finally
+ call chdir(saved_cwd)
+ endtry
+ endfor
+ if !exists('dir')
+ throw 'Skipped: no testable directories found in the current drive root'
+ endif
+
" Get partial path
let partial = dir[0:-2]
- " Get the current drive letter
- let old = chdir('/' . dir)
+ " Get the current drive letter and full path of the target dir
+ call chdir('/' .. dir)
let full = getcwd()
let drive = full[0]
- call chdir(old)
+ call chdir(saved_cwd)
for cmd in ['cd', 'chdir', 'lcd', 'lchdir', 'tcd', 'tchdir']
for sep in [ '/', '\']
diff --git a/src/version.c b/src/version.c
index 8311522df..b724308b5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 2050,
/**/
2049,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vcKR6-00DPTf-Kx%40256bit.org.
