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 ba728df..8956384 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -117,7 +117,7 @@
# 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 00c9e10..f9dcfc8 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -129,7 +129,7 @@
# 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 7033d1e..6431f6a 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -12,7 +12,7 @@
# 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 @@
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 70fe7df..71851c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1525,
+/**/
1524,
/**/
1523,