# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1598474704 -7200
# Node ID 3ece5c9fe811978e8ed19325a1dc5e5d7752dce6
# Parent  e92c113380c5317d276359a74d216c3884d817c7
patch 8.2.1525: messages from tests were not always displayed

Commit: https://github.com/vim/vim/commit/6e3aeec8461cf27396b6574b5438019a00684e00
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Aug 26 22:29:57 2020 +0200

    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
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -117,7 +117,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 # 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
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -129,7 +129,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
 # 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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1525,
+/**/
     1524,
 /**/
     1523,