Mercurial > vim

comparison src/testdir/Makefile @ 16951:ebdf6cd89910 v8.1.1476

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1476: no statistics displayed after running tests commit https://github.com/vim/vim/commit/9c0cec65f891492314caadeef87a50251a21e630 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jun 6 13:38:15 2019 +0200 patch 8.1.1476: no statistics displayed after running tests Problem: No statistics displayed after running tests. Solution: Summarize the test results. (Christian Brabandt, closes https://github.com/vim/vim/issues/4391) Also make it possible to report a skipped file.
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 Jun 2019 13:45:05 +0200
parents 0d6331501d19
children 54c2fe0eff03
comparison
equal deleted inserted replaced
16950:a8735038f8d5 16951:ebdf6cd89910
10 SCRIPTSOURCE = ../../runtime 10 SCRIPTSOURCE = ../../runtime
11 11
12 # Comment out this line to see the verbose output of tests. 12 # Comment out this line to see the verbose output of tests.
13 # 13 #
14 # Catches SwapExists to avoid hanging at the ATTENTION prompt. 14 # 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
16 16
17 # Uncomment this line to use valgrind for memory leaks and extra warnings. 17 # Uncomment this line to use valgrind for memory leaks and extra warnings.
18 # The output goes into a file "valgrind.testN" 18 # The output goes into a file "valgrind.testN"
19 # Vim should be compiled with EXITFREE to avoid false warnings. 19 # Vim should be compiled with EXITFREE to avoid false warnings.
20 # This will make testing about 10 times as slow. 20 # This will make testing about 10 times as slow.
47 gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report 47 gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
48 48
49 benchmark: $(SCRIPTS_BENCH) 49 benchmark: $(SCRIPTS_BENCH)
50 50
51 report: 51 report:
52 $(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL)
52 @echo 53 @echo
53 @echo 'Test results:' 54 @echo 'Test results:'
55 @cat test_result.log
54 @/bin/sh -c "if test -f test.log; \ 56 @/bin/sh -c "if test -f test.log; \
55 then cat test.log; echo TEST FAILURE; exit 1; \ 57 then echo TEST FAILURE; exit 1; \
56 else echo ALL DONE; \ 58 else echo ALL DONE; \
57 fi" 59 fi"
58 60
59 $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS_RES): $(VIMPROG) 61 $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS_RES): $(VIMPROG)
60 62
75 RM_ON_RUN = test.out X* viminfo 77 RM_ON_RUN = test.out X* viminfo
76 RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out 78 RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
77 RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in 79 RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
78 80
79 clean: 81 clean:
80 -rm -rf *.out *.failed *.res *.rej *.orig opt_test.vim test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.* 82 -rm -rf *.out *.failed *.res *.rej *.orig
83 -rm opt_test.vim test.log test_result.log messages
84 -rm $(RM_ON_RUN) $(RM_ON_START)
85 -rm valgrind.*
81 86
82 test1.out: test1.in 87 test1.out: test1.in
83 -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize 88 -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
84 $(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL) 89 $(RUN_VIM) $*.in $(REDIR_TEST_TO_NULL)
85 @/bin/sh -c "if test -f wrongtermsize; \ 90 @/bin/sh -c "if test -f wrongtermsize; \