From 593df501b3a3687abb14a84299716bcd328b6ff8 Mon Sep 17 00:00:00 2001 From: watiko Date: Sun, 13 Dec 2015 12:19:54 +0900 Subject: vim-patch:7.4.944 Problem: Writing tests for Vim script is hard. Solution: Add assertEqual(), assertFalse() and assertTrue() functions. Add the v:errors variable. Add the runtest script. Add a first new style test script. https://github.com/vim/vim/commit/43345546ae63710441f066648b8485fb545b3801 --- src/nvim/testdir/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 1a414a8847..57d356705e 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 = test_assert.res + 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,14 @@ 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: $(NEW_TESTS) + +%.res: %.vim .gdbinit + $(RUN_VIMTEST) -u runtest.vim $*.vim -- cgit From 008c014cbe0fd4862dd989287aca1050d2ed89b1 Mon Sep 17 00:00:00 2001 From: watiko Date: Sun, 13 Dec 2015 20:15:48 +0900 Subject: vim-patch:7.4.945 Problem: New style testing is incomplete. Solution: Add the runtest script to the list of distributed files. Add the new functions to the function overview. Rename the functions to match Vim function style. Move undolevels testing into a new style test script. https://github.com/vim/vim/commit/683fa185a4b4ed7595e5942901548b8239ed5cdb --- src/nvim/testdir/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 57d356705e..23a9b97d91 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -31,7 +31,8 @@ SCRIPTS := test_eval.out \ test_command_count.out \ test_cdo.out \ -NEW_TESTS = test_assert.res +NEW_TESTS = test_assert.res \ + test_undolevels.res SCRIPTS_GUI := test16.out -- cgit From 6c8e572d098457868c9090fa562d9628c6537849 Mon Sep 17 00:00:00 2001 From: watiko Date: Sun, 10 Jan 2016 09:10:17 +0900 Subject: vim-patch:7.4.1055 Problem: Running "make newtests" in src/testdir has no output. Solution: List the messages file when a test fails. (Christian Brabandt) Update the list of tests. https://github.com/vim/vim/commit/e7893a4088d6ea796bcab6195d232cb26c12c317 --- src/nvim/testdir/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 23a9b97d91..efcb8a68d2 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -158,7 +158,12 @@ nolog: # Limitation: Only works with the +eval feature. RUN_VIMTEST = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -newtests: $(NEW_TESTS) +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 -- cgit From d8e07deff6e3763166259f04c57b8f253bb2db46 Mon Sep 17 00:00:00 2001 From: watiko Date: Thu, 17 Dec 2015 17:22:19 +0900 Subject: tests: Migrate legacy test assert. --- src/nvim/testdir/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index efcb8a68d2..381d1727da 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -31,8 +31,7 @@ SCRIPTS := test_eval.out \ test_command_count.out \ test_cdo.out \ -NEW_TESTS = test_assert.res \ - test_undolevels.res +NEW_TESTS = test_undolevels.res SCRIPTS_GUI := test16.out -- cgit From 9c5ab23ef2e0adf45b09d9f0586e5c914db9658f Mon Sep 17 00:00:00 2001 From: watiko Date: Thu, 17 Dec 2015 17:55:34 +0900 Subject: tests: Migrate legacy test undolevels. --- src/nvim/testdir/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/testdir/Makefile') diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 381d1727da..b4292dbd4b 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -31,7 +31,7 @@ SCRIPTS := test_eval.out \ test_command_count.out \ test_cdo.out \ -NEW_TESTS = test_undolevels.res +NEW_TESTS = SCRIPTS_GUI := test16.out -- cgit