diff options
| author | watiko <service@mail.watiko.net> | 2016-01-11 05:38:54 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-01-15 23:50:04 +0900 |
| commit | 4eba134a551161384428229fbd80721eb49b5a09 (patch) | |
| tree | d2c8e93692b0f2a5dc9cd296d7e208d2ce42bd2f | |
| parent | 9d184927931a44784136cce58ece63ef9f7bec32 (diff) | |
| download | rneovim-4eba134a551161384428229fbd80721eb49b5a09.tar.gz rneovim-4eba134a551161384428229fbd80721eb49b5a09.tar.bz2 rneovim-4eba134a551161384428229fbd80721eb49b5a09.zip | |
vim-patch:7.4.991
Problem: When running new style tests the output is not visible.
Solution: Add the testdir/messages file and show it. Update the list of
test names.
https://github.com/vim/vim/commit/096c8bb40d51b22a4b1d761baf7bb79fb9e55a28
| -rw-r--r-- | src/nvim/testdir/Makefile | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 17 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 19 insertions, 5 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 791e1d90cd..c4605fe6b4 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -96,6 +96,7 @@ clean: *.rej \ *.orig \ test.log \ + messages \ $(RM_ON_RUN) \ $(RM_ON_START) \ valgrind.* \ @@ -148,7 +149,7 @@ test1.out: .gdbinit test1.in test49.out: test49.vim nolog: - -rm -f test.log + -rm -f test.log messages # New style of tests uses Vim script with assert calls. These are easier @@ -164,4 +165,4 @@ newtests: newtestssilent newtestssilent: $(NEW_TESTS) %.res: %.vim .gdbinit - $(RUN_VIMTEST) -S runtest.vim $*.vim + $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index cca7c751df..8314a45d0c 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -39,6 +39,7 @@ let testname = expand('%') let done = 0 let fail = 0 let errors = [] +let messages = [] try source % catch @@ -57,6 +58,7 @@ for test in tests call SetUp() endif + call add(messages, 'Executing ' . test) let done += 1 try exe 'call ' . test @@ -92,9 +94,20 @@ if len(errors) > 0 write endif -echo 'Executed ' . done . (done > 1 ? ' tests': ' test') +let message = 'Executed ' . done . (done > 1 ? ' tests': ' test') +echo message +call add(messages, message) if fail > 0 - echo fail . ' FAILED' + let message = fail . ' FAILED' + echo message + call add(messages, message) endif +" Append messages to "messages" +split messages +call append(line('$'), '') +call append(line('$'), 'From ' . testname . ':') +call append(line('$'), messages) +write + qall! diff --git a/src/nvim/version.c b/src/nvim/version.c index 406edbfa3c..8c9faac0c3 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -133,7 +133,7 @@ static int included_patches[] = { // 994 NA // 993, // 992 NA - // 991, + 991, // 990 NA 989, // 988 NA |