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.

096c8bb40d
This commit is contained in:
watiko
2016-01-11 05:38:54 +09:00
parent 9d18492793
commit 4eba134a55
3 changed files with 19 additions and 5 deletions

View File

@@ -96,6 +96,7 @@ clean:
*.rej \ *.rej \
*.orig \ *.orig \
test.log \ test.log \
messages \
$(RM_ON_RUN) \ $(RM_ON_RUN) \
$(RM_ON_START) \ $(RM_ON_START) \
valgrind.* \ valgrind.* \
@@ -148,7 +149,7 @@ test1.out: .gdbinit test1.in
test49.out: test49.vim test49.out: test49.vim
nolog: nolog:
-rm -f test.log -rm -f test.log messages
# New style of tests uses Vim script with assert calls. These are easier # New style of tests uses Vim script with assert calls. These are easier
@@ -164,4 +165,4 @@ newtests: newtestssilent
newtestssilent: $(NEW_TESTS) newtestssilent: $(NEW_TESTS)
%.res: %.vim .gdbinit %.res: %.vim .gdbinit
$(RUN_VIMTEST) -S runtest.vim $*.vim $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim

View File

@@ -39,6 +39,7 @@ let testname = expand('%')
let done = 0 let done = 0
let fail = 0 let fail = 0
let errors = [] let errors = []
let messages = []
try try
source % source %
catch catch
@@ -57,6 +58,7 @@ for test in tests
call SetUp() call SetUp()
endif endif
call add(messages, 'Executing ' . test)
let done += 1 let done += 1
try try
exe 'call ' . test exe 'call ' . test
@@ -92,9 +94,20 @@ if len(errors) > 0
write write
endif 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 if fail > 0
echo fail . ' FAILED' let message = fail . ' FAILED'
echo message
call add(messages, message)
endif endif
" Append messages to "messages"
split messages
call append(line('$'), '')
call append(line('$'), 'From ' . testname . ':')
call append(line('$'), messages)
write
qall! qall!

View File

@@ -133,7 +133,7 @@ static int included_patches[] = {
// 994 NA // 994 NA
// 993, // 993,
// 992 NA // 992 NA
// 991, 991,
// 990 NA // 990 NA
989, 989,
// 988 NA // 988 NA