comparison src/testdir/Makefile @ 14824:845180495796 v8.1.0424

patch 8.1.0424: test output is very verbose, loading CI log is slow commit https://github.com/vim/vim/commit/e76d7a63dfe916c321e248fbfc97bd948d6fbabb Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 21 16:37:25 2018 +0200 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 https://github.com/vim/vim/issues/3456)
author Christian Brabandt <cb@256bit.org>
date Fri, 21 Sep 2018 16:45:05 +0200
parents 9b04068f7265
children ba1f0c06b4be
comparison
equal deleted inserted replaced
14823:dcdb2b4dbb6b 14824:845180495796
6 VIMPROG = ../vim 6 VIMPROG = ../vim
7 XXDPROG = ../xxd/xxd 7 XXDPROG = ../xxd/xxd
8 # VIMPROG = ../gvim 8 # VIMPROG = ../gvim
9 9
10 SCRIPTSOURCE = ../../runtime 10 SCRIPTSOURCE = ../../runtime
11
12 # Change this to empty to see the verbose output of tests.
13 REDIR_TEST_TO_NULL = > /dev/null
11 14
12 # Uncomment this line to use valgrind for memory leaks and extra warnings. 15 # Uncomment this line to use valgrind for memory leaks and extra warnings.
13 # The output goes into a file "valgrind.testN" 16 # The output goes into a file "valgrind.testN"
14 # Vim should be compiled with EXITFREE to avoid false warnings. 17 # Vim should be compiled with EXITFREE to avoid false warnings.
15 # This will make testing about 10 times as slow. 18 # This will make testing about 10 times as slow.
57 clean: 60 clean:
58 -rm -rf *.out *.failed *.res *.rej *.orig opt_test.vim test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.* 61 -rm -rf *.out *.failed *.res *.rej *.orig opt_test.vim test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.*
59 62
60 test1.out: test1.in 63 test1.out: test1.in
61 -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize 64 -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
62 $(RUN_VIM) $*.in 65 $(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
63 @/bin/sh -c "if test -f wrongtermsize; \ 66 @/bin/sh -c "if test -f wrongtermsize; \
64 then echo; \ 67 then echo; \
65 echo test1 FAILED - terminal size must be 80x24 or larger; \ 68 echo test1 FAILED - terminal size must be 80x24 or larger; \
66 echo; exit 1; \ 69 echo; exit 1; \
67 elif diff test.out $*.ok; \ 70 elif diff test.out $*.ok; \
76 cp $*.ok test.ok 79 cp $*.ok test.ok
77 # Sleep a moment to avoid that the xterm title is messed up. 80 # Sleep a moment to avoid that the xterm title is messed up.
78 # 200 msec is sufficient, but only modern sleep supports a fraction of 81 # 200 msec is sufficient, but only modern sleep supports a fraction of
79 # a second, fall back to a second if it fails. 82 # a second, fall back to a second if it fails.
80 @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" 83 @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
81 $(RUN_VIM) $*.in 84 $(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
82 85
83 # For flaky tests retry one time. No tests at the moment. 86 # For flaky tests retry one time. No tests at the moment.
84 #@/bin/sh -c "if test -f test.out -a $* = test61; then \ 87 #@/bin/sh -c "if test -f test.out -a $* = test61; then \
85 # if diff test.out $*.ok; \ 88 # if diff test.out $*.ok; \
86 # then echo flaky test ok first time; \ 89 # then echo flaky test ok first time; \
106 -rm -rf benchmark.out $(RM_ON_RUN) 109 -rm -rf benchmark.out $(RM_ON_RUN)
107 # Sleep a moment to avoid that the xterm title is messed up. 110 # Sleep a moment to avoid that the xterm title is messed up.
108 # 200 msec is sufficient, but only modern sleep supports a fraction of 111 # 200 msec is sufficient, but only modern sleep supports a fraction of
109 # a second, fall back to a second if it fails. 112 # a second, fall back to a second if it fails.
110 @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" 113 @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
111 $(RUN_VIM) $*.in 114 $(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
112 @/bin/sh -c "if test -f benchmark.out; then cat benchmark.out; fi" 115 @/bin/sh -c "if test -f benchmark.out; then cat benchmark.out; fi"
113 116
114 nolog: 117 nolog:
115 -rm -f test.log messages 118 -rm -f test.log messages
116 119
127 130
128 131
129 .vim.res: writevimcmd 132 .vim.res: writevimcmd
130 @echo "$(VIMPROG)" > vimcmd 133 @echo "$(VIMPROG)" > vimcmd
131 @echo "$(RUN_VIMTEST)" >> vimcmd 134 @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)
133 @rm vimcmd 136 @rm vimcmd
134 137
135 test_gui.res: test_gui.vim 138 test_gui.res: test_gui.vim
136 @echo "$(VIMPROG)" > vimcmd 139 @echo "$(VIMPROG)" > vimcmd
137 @echo "$(RUN_GVIMTEST)" >> vimcmd 140 @echo "$(RUN_GVIMTEST)" >> vimcmd