diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-10 01:33:05 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-10 01:33:05 -0500 |
| commit | 9bf694ff0bd6a4251758524f762847208618c8f3 (patch) | |
| tree | 3e97b13c44361ef74f02fa18ffe8c9fea2f9a690 /src/nvim/testdir/Makefile | |
| parent | 50db0312f941ba489466d7d6b21088f1870429ee (diff) | |
| parent | f350655ddd3846f7c1e12a21fcb30d49f90fa6b6 (diff) | |
| download | rneovim-9bf694ff0bd6a4251758524f762847208618c8f3.tar.gz rneovim-9bf694ff0bd6a4251758524f762847208618c8f3.tar.bz2 rneovim-9bf694ff0bd6a4251758524f762847208618c8f3.zip | |
Merge #3857 'Vim 7.4.{944,945,946,950,953,1032,1055}'.
Diffstat (limited to 'src/nvim/testdir/Makefile')
| -rw-r--r-- | src/nvim/testdir/Makefile | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 1a414a8847..b4292dbd4b 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -31,6 +31,8 @@ SCRIPTS := test_eval.out \ test_command_count.out \ test_cdo.out \ +NEW_TESTS = + SCRIPTS_GUI := test16.out @@ -62,9 +64,9 @@ ifdef TESTNUM SCRIPTS := test$(TESTNUM).out endif -nongui: nolog $(SCRIPTS) report +nongui: nolog $(SCRIPTS) newtests report -gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) report +gui: nolog $(SCRIPTS) $(SCRIPTS_GUI) newtests report .gdbinit: echo 'set $$_exitcode = -1\nrun\nif $$_exitcode != -1\n quit\nend' > .gdbinit @@ -91,6 +93,7 @@ RUN_VIM := VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(TOOL) $(VIMPROG) clean: -rm -rf *.out \ *.failed \ + *.res \ *.rej \ *.orig \ test.log \ @@ -147,3 +150,19 @@ test49.out: test49.vim nolog: -rm -f test.log + + +# New style of tests uses Vim script with assert calls. These are easier +# to write and a lot easier to read and debug. +# Limitation: Only works with the +eval feature. +RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin + +newtests: newtestssilent + @/bin/sh -c "if test -f messages && grep -q 'FAILED' messages; then \ + cat messages && cat test.log; \ + fi" \ + +newtestssilent: $(NEW_TESTS) + +%.res: %.vim .gdbinit + $(RUN_VIMTEST) -u runtest.vim $*.vim |