Commit: patch 9.1.0284: make testclean is not able to delete failed screendumps

7 views
Skip to first unread message

Christian Brabandt

unread,
Apr 9, 2024, 3:30:11 PM4/9/24
to vim...@googlegroups.com
patch 9.1.0284: make testclean is not able to delete failed screendumps

Commit: https://github.com/vim/vim/commit/e20c7d7f442e0d42d78db7337c1b5e7a3ff91671
Author: Julio B <julio...@gmail.com>
Date: Tue Apr 9 21:22:41 2024 +0200

patch 9.1.0284: make testclean is not able to delete failed screendumps

Problem: make testclean is not able to delete failed screendumps.
Solution: Remove the "failed" directory when necessary.
(Julio B)

Patch 8.1.1080 changed the way that failed screendumps are saved, but
the "rm -rf *.failed" clean command was not ported correctly.

closes: #14468

Signed-off-by: Julio B <julio...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index fd2e56c19..4e476f966 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -89,7 +89,7 @@ RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u un
# Delete files that may interfere with running tests. This includes some files
# that may result from working on the tests, not only from running them.
clean:
- -rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind
+ -rm -rf *.out *.failed *.res *.rej *.orig XfakeHOME Xdir1 Xfind failed
-rm -f opt_test.vim test_result.log $(CLEANUP_FILES)
-rm -rf $(RM_ON_RUN) $(RM_ON_START)
-rm -f valgrind.*
diff --git a/src/version.c b/src/version.c
index dc9f775ff..bafbe5b8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 284,
/**/
283,
/**/
Reply all
Reply to author
Forward
0 new messages