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 0abf66137dc9a16d37cf113b56f51c10ea99b79a..4bfc40096ed7c15af53d86136a8a198365611c2d 100644 (file)
--- 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 54cb5c18415d57a8a4f489fe9cd0c3ed3344a026..5baee63489824585a2c38b1ce550ff7dffebde42 100644 (file)
--- 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 1c8da448e70fb84a00a48ce9c046a02dad31e664..648391162ab25afcb3ab2d100edc8d008a809ac3 100644 (file)
--- 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,
 /**/