Skip to content

Commit 6e3aeec

Browse files
committed
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)
1 parent 2e08661 commit 6e3aeec

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/testdir/Make_dos.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
117117
# Limitation: Only works with the +eval feature.
118118

119119
newtests: newtestssilent
120-
@if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
120+
@if exist messages type messages
121121

122122
newtestssilent: $(NEW_TESTS_RES)
123123

src/testdir/Make_ming.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ $(DOSTMP)/%.in : %.in
129129
# Limitation: Only works with the +eval feature.
130130

131131
newtests: newtestssilent
132-
@if exist messages (findstr "SKIPPED FAILED" messages > nul) && type messages
132+
@if exist messages type messages
133133

134134
newtestssilent: $(NEW_TESTS_RES)
135135

src/testdir/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime
1212
# Comment out this line to see the verbose output of tests.
1313
#
1414
# Catches SwapExists to avoid hanging at the ATTENTION prompt.
15-
REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null
15+
#REDIR_TEST_TO_NULL = --cmd 'au SwapExists * let v:swapchoice = "e"' > /dev/null
1616

1717
# Uncomment this line to use valgrind for memory leaks and extra warnings.
1818
# The output goes into a file "valgrind.testN"
@@ -126,7 +126,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
126126
RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE) $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim
127127

128128
newtests: newtestssilent
129-
@/bin/sh -c "if test -f messages && grep -q 'SKIPPED\|FAILED' messages; then cat messages; fi"
129+
@/bin/sh -c "if test -f messages; then cat messages; fi"
130130

131131
newtestssilent: $(NEW_TESTS_RES)
132132

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1525,
757759
/**/
758760
1524,
759761
/**/

0 commit comments

Comments
 (0)