summaryrefslogtreecommitdiffstats
path: root/src/testdir/Makefile
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-06 13:38:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-06 13:38:15 +0200
commit9c0cec65f891492314caadeef87a50251a21e630 (patch)
treeccf15ae17380248ffc511f53bf3e1dceb40bb628 /src/testdir/Makefile
parentdb294adc65d73ffa5cdf3d0ab45ccbf05b965414 (diff)
patch 8.1.1476: no statistics displayed after running testsv8.1.1476
Problem: No statistics displayed after running tests. Solution: Summarize the test results. (Christian Brabandt, closes #4391) Also make it possible to report a skipped file.
Diffstat (limited to 'src/testdir/Makefile')
-rw-r--r--src/testdir/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 45c520d2df..0abf66137d 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -12,7 +12,7 @@ SCRIPTSOURCE = ../../runtime
# 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"
@@ -49,10 +49,12 @@ gui: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests report
benchmark: $(SCRIPTS_BENCH)
report:
+ $(RUN_VIMTEST) $(NO_INITS) -S summarize.vim messages $(REDIR_TEST_TO_NULL)
@echo
@echo 'Test results:'
+ @cat test_result.log
@/bin/sh -c "if test -f test.log; \
- then cat test.log; echo TEST FAILURE; exit 1; \
+ then echo TEST FAILURE; exit 1; \
else echo ALL DONE; \
fi"
@@ -77,7 +79,10 @@ RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
clean:
- -rm -rf *.out *.failed *.res *.rej *.orig opt_test.vim test.log messages $(RM_ON_RUN) $(RM_ON_START) valgrind.*
+ -rm -rf *.out *.failed *.res *.rej *.orig
+ -rm opt_test.vim test.log test_result.log messages
+ -rm $(RM_ON_RUN) $(RM_ON_START)
+ -rm valgrind.*
test1.out: test1.in
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize