Commit: patch 9.1.2009: tests: "Xm4" test directory may not be deleted

0 views
Skip to first unread message

Christian Brabandt

unread,
1:45 PM (7 hours ago) 1:45 PM
to vim...@googlegroups.com
patch 9.1.2009: tests: "Xm4" test directory may not be deleted

Commit: https://github.com/vim/vim/commit/de37e7430a021f006d3fb5ce9d4ef3b6ee812161
Author: Muraoka Taro <koron....@gmail.com>
Date: Mon Dec 22 18:33:50 2025 +0000

patch 9.1.2009: tests: "Xm4" test directory may not be deleted

Problem: tests: "Xm4" test directory may not be deleted
Solution: Use "R" flag with mkdir() call to have the directory
recursively deleted at the end of function Test_m4_format()
(Muraoka Taro)

Test_m4_format in test_filetype.vim creates the "Xm4" directory with the
'D' flag. Then it creates two files in the "Xm4" directory. One of them,
"alocal.m4," was created with the 'D' flag, so it will disappear after
the test is complete. However, the other, "configure.ac," was created
without any flags, so it will remain even after the test is complete.
Because the parent directory "Xm4" was created with the 'D' flag, the
latter "configure.ac" remains and is not empty, so it will not be
deleted.

This forces the directory to be deleted regardless of its contents. As a
result, the two files "alocal.m4" and "configure.ac" created in the
directory are no longer needed, so they have been deleted.

closes: #18995

Signed-off-by: Muraoka Taro <koron....@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 03682688c..ee6f6c9ec 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -3235,9 +3235,9 @@ endfunc
func Test_m4_format()
filetype on

- call mkdir('Xm4', 'D')
+ call mkdir('Xm4', 'R')
cd Xm4
- call writefile([''], 'alocal.m4', 'D')
+ call writefile([''], 'alocal.m4')
split alocal.m4
call assert_equal('m4', &filetype)
bwipe!
diff --git a/src/version.c b/src/version.c
index 39b4a15ad..28336399b 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 */
+/**/
+ 2009,
/**/
2008,
/**/
Reply all
Reply to author
Forward
0 new messages