Skip to content

Commit e76d7a6

Browse files
committed
patch 8.1.0424: test output is very verbose, loading CI log is slow
Problem: Test output is very verbose, loading CI log is slow. Solution: Redirect output to /dev/null. (Ken Takata, closes #3456)
1 parent 0bd4051 commit e76d7a6

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/testdir/Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ XXDPROG = ../xxd/xxd
99

1010
SCRIPTSOURCE = ../../runtime
1111

12+
# Change this to empty to see the verbose output of tests.
13+
REDIR_TEST_TO_NULL = > /dev/null
14+
1215
# Uncomment this line to use valgrind for memory leaks and extra warnings.
1316
# The output goes into a file "valgrind.testN"
1417
# Vim should be compiled with EXITFREE to avoid false warnings.
@@ -59,7 +62,7 @@ clean:
5962

6063
test1.out: test1.in
6164
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
62-
$(RUN_VIM) $*.in
65+
$(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
6366
@/bin/sh -c "if test -f wrongtermsize; \
6467
then echo; \
6568
echo test1 FAILED - terminal size must be 80x24 or larger; \
@@ -78,7 +81,7 @@ test1.out: test1.in
7881
# 200 msec is sufficient, but only modern sleep supports a fraction of
7982
# a second, fall back to a second if it fails.
8083
@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
81-
$(RUN_VIM) $*.in
84+
$(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
8285

8386
# For flaky tests retry one time. No tests at the moment.
8487
#@/bin/sh -c "if test -f test.out -a $* = test61; then \
@@ -108,7 +111,7 @@ bench_re_freeze.out: bench_re_freeze.vim
108111
# 200 msec is sufficient, but only modern sleep supports a fraction of
109112
# a second, fall back to a second if it fails.
110113
@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
111-
$(RUN_VIM) $*.in
114+
$(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
112115
@/bin/sh -c "if test -f benchmark.out; then cat benchmark.out; fi"
113116

114117
nolog:
@@ -129,7 +132,7 @@ newtestssilent: $(NEW_TESTS)
129132
.vim.res: writevimcmd
130133
@echo "$(VIMPROG)" > vimcmd
131134
@echo "$(RUN_VIMTEST)" >> vimcmd
132-
$(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim
135+
$(RUN_VIMTEST) $(NO_INITS) -S runtest.vim $*.vim $(REDIR_TEST_TO_NULL)
133136
@rm vimcmd
134137

135138
test_gui.res: test_gui.vim

src/version.c

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

795795
static int included_patches[] =
796796
{ /* Add new patch number below this line */
797+
/**/
798+
424,
797799
/**/
798800
423,
799801
/**/

0 commit comments

Comments
 (0)