summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulio B <julio.bacel@gmail.com>2024-04-09 21:22:41 +0200
committerChristian Brabandt <cb@256bit.org>2024-04-09 21:22:41 +0200
commite20c7d7f442e0d42d78db7337c1b5e7a3ff91671 (patch)
treebe91654c74e5c08d416eac41c0ee1b51955102ee
parente43ace558aee904f5ebb805daed763961bdbccde (diff)
patch 9.1.0284: make testclean is not able to delete failed screendumpsv9.1.0284
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.bacel@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/testdir/Makefile2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index fd2e56c197..4e476f9663 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 dc9f775ff2..bafbe5b8ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 284,
+/**/
283,
/**/
282,