From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 6 Jun 2019 12:28:54 +0000 (+0200)
Subject: patch 8.1.1478: still an error when running tests with the tiny version
X-Git-Tag: v8.1.1478
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18250e291a5b4b8e32229d99ccb7c895ff0ca637;p=vim

patch 8.1.1478: still an error when running tests with the tiny version

Problem:    Still an error when running tests with the tiny version.
Solution:   Do not try reading test.log
---

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 0abf66137..4bfc40096 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -49,6 +49,11 @@ gui:	nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
 benchmark: $(SCRIPTS_BENCH)
 
 report:
+	# without the +eval feature test_result.log is a copy of test.log
+	@/bin/sh -c "if test -f test.log; \
+		then cp test.log test_result.log; \
+		else echo No failures reported > test_result.log; \
+		fi"
 	$(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL)
 	@echo
 	@echo 'Test results:'
diff --git a/src/testdir/summarize.vim b/src/testdir/summarize.vim
index 54cb5c184..5baee6348 100644
--- a/src/testdir/summarize.vim
+++ b/src/testdir/summarize.vim
@@ -50,12 +50,7 @@ if 1
   catch  " Catch-all
   finally
     call writefile(output, 'test_result.log')  " overwrites an existing file
-    q!
   endtry
 endif
 
-" This is executed without the eval feature
-%d
-r test.log
-w test_result.log
 q!
diff --git a/src/version.c b/src/version.c
index 1c8da448e..648391162 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1478,
 /**/
     1477,
 /**/