From 72f453d149d288061616cb558190d0f7efca0db1 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 20 Aug 2019 05:04:15 +0200
Subject: vim-patch:8.1.1476: no statistics displayed after running tests

Problem:    No statistics displayed after running tests.
Solution:   Summarize the test results. (Christian Brabandt, closes vim/vim#4391)
            Also make it possible to report a skipped file.
https://github.com/vim/vim/commit/9c0cec65f891492314caadeef87a50251a21e630

Removes our custom no-inits from `$(RUN_VIMTEST)`, since we have
`$(NO_INITS)` now also.
---
 src/nvim/testdir/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 90381d9116..ef3dce5932 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -86,15 +86,14 @@ nongui: nolog $(FIXFF) $(SCRIPTS) newtests report
 	@echo 'set $$_exitcode = -1\nrun\nif $$_exitcode != -1\n  quit\nend' > .gdbinit
 
 report:
+	$(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages
 	@echo
 	@echo 'Test results:'
-	@/bin/sh -c "if test -f test.log; then \
-	                 cat test.log;         \
-	                 echo TEST FAILURE;    \
-	                 exit 1;               \
-	             else                      \
-	                 echo ALL DONE;        \
-	             fi"
+	@cat test_result.log
+	@/bin/sh -c "if test -f test.log; \
+		then echo TEST FAILURE; exit 1; \
+		else echo ALL DONE; \
+		fi"
 
 test1.out: $(NVIM_PRG)
 
@@ -124,6 +123,7 @@ CLEAN_FILES := *.out \
   *.orig            \
   *.tlog            \
   test.log          \
+  test_result.log   \
   messages          \
   $(RM_ON_RUN)      \
   $(RM_ON_START)    \
@@ -163,7 +163,7 @@ nolog:
 # New style of tests uses Vim script with assert calls.  These are easier
 # to write and a lot easier to read and debug.
 # Limitation: Only works with the +eval feature.
-RUN_VIMTEST = $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin
+RUN_VIMTEST = $(TOOL) $(NVIM_PRG) -u unix.vim
 
 newtests: newtestssilent
 	@/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \
@@ -176,4 +176,4 @@ newtestssilent: $(NEW_TESTS)
 	@echo "[OLDTEST] Running" $*
 	@rm -rf $*.failed test.ok $(RM_ON_RUN)
 	@mkdir -p $(TMPDIR)
-	@/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim
+	@/bin/sh runnvim.sh $(ROOT) $(NVIM_PRG) $* $(RUN_VIMTEST) $(NO_INITS) -u NONE -S runtest.vim $*.vim
-- 
cgit 


From 86d88076ceeef20301b06fd69a8f98c73cffe9c6 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 21 Aug 2019 08:37:35 +0200
Subject: -u NONE for no syntax highlighting

---
 src/nvim/testdir/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/testdir/Makefile')

diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index ef3dce5932..03b1bae28f 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -86,7 +86,7 @@ nongui: nolog $(FIXFF) $(SCRIPTS) newtests report
 	@echo 'set $$_exitcode = -1\nrun\nif $$_exitcode != -1\n  quit\nend' > .gdbinit
 
 report:
-	$(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages
+	$(RUN_VIMTEST) $(NO_INITS) -u NONE -S summarize.vim messages
 	@echo
 	@echo 'Test results:'
 	@cat test_result.log
-- 
cgit