From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 26 Aug 2020 20:29:57 +0000 (+0200)
Subject: patch 8.2.1525: messages from tests were not always displayed
X-Git-Tag: v8.2.1525
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e3aeec8461cf27396b6574b5438019a00684e00;p=vim

patch 8.2.1525: messages from tests were not always displayed

Problem:    Messages from tests were not always displayed.
Solution:   Always show messages, the timing is always useful. (Ken Takata,
            closes #6792)
---

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index ba728df9e..89563848e 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -117,7 +117,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 # Limitation: Only works with the +eval feature.
 
 newtests: newtestssilent
-	@if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
+	@if exist messages type messages
 
 newtestssilent: $(NEW_TESTS_RES)
 
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 00c9e1087..f9dcfc86e 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -129,7 +129,7 @@ $(DOSTMP)/%.in : %.in
 # Limitation: Only works with the +eval feature.
 
 newtests: newtestssilent
-	@if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
+	@if exist messages type messages
 
 newtestssilent: $(NEW_TESTS_RES)
 
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 7033d1e46..6431f6a6b 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime
 # Comment out this line to see the verbose output of tests.
 #
 # Catches SwapExists to avoid hanging at the ATTENTION prompt.
-REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null
+#REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null
 
 # Uncomment this line to use valgrind for memory leaks and extra warnings.
 #   The output goes into a file "valgrind.testN"
@@ -126,7 +126,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim
 
 newtests: newtestssilent
-	@/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages; fi"
+	@/bin/sh -c "if test -f messages; then cat messages; fi"
 
 newtestssilent: $(NEW_TESTS_RES)
 
diff --git a/src/version.c b/src/version.c
index 70fe7df1f..71851c849 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1525,
 /**/
     1524,
 /**/