Hi,

I found two issues with tests on Windows GUI.

1. Test11 waits user input, so the test cannot finish automatically.

When the test executes some external command, vimrun.exe shows the
message "Hit any key to close this window..." and the test stops.
The patch fix-test11-on-windows.patch adds :silent to avoid this problem.


2. Test100 fails.

This is an example of the test result:

1c1
<
---
> ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
10a11,13
>   undolevels=5 global
>   undolevels=-123456 local
> TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 
> (afterwards)
24a28,30
>
>   undolevels=5 global
>   undolevels=10 local

I'm not sure what is happening with this, but it seems that feedkeys()
causes some problems. After adding a ':' line after each call of
feedkeys(), test100 succeeded. Wow!?
(Make_dos.mak is also fixed because test100.ok must have unix line ending.)

Regards,
Ken Takata

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/testdir/test11.in b/src/testdir/test11.in
--- a/src/testdir/test11.in
+++ b/src/testdir/test11.in
@@ -46,13 +46,13 @@ STARTTEST
 :w>>test.out                    " Append it to the output file
 :set shelltemp                  " need temp files here
 :au FilterReadPre   *.out  call rename(expand("<afile>"), expand("<afile>") . ".t")
-:au FilterReadPre   *.out  exe '!sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>"))
-:au FilterReadPre   *.out  exe '!rm ' . shellescape(expand("<afile>")) . '.t'
+:au FilterReadPre   *.out  exe 'silent !sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>"))
+:au FilterReadPre   *.out  exe 'silent !rm ' . shellescape(expand("<afile>")) . '.t'
 :au FilterReadPost  *.out  '[,']s/x/X/g
 :e! test.out                    " Edit the output file
 :23,$!cat
 :23,$s/\r$//                 " remove CR for when sed adds them
-:au! FileReadPre    *.gz   exe '!gzip -d ' . shellescape(expand("<afile>"))
+:au! FileReadPre    *.gz   exe 'silent !gzip -d ' . shellescape(expand("<afile>"))
 :au  FileReadPre    *.gz   call rename(expand("<afile>:r"), expand("<afile>"))
 :au! FileReadPost   *.gz   '[,']s/l/L/
 :$r Xtestfile.gz             " Read compressed file
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -94,7 +94,7 @@ win32:	nolog $(SCRIPTS16) $(SCRIPTS) $(S
 fixff:
 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
-		dotest.in test60.ok test71.ok test74.ok
+		dotest.in test60.ok test71.ok test74.ok test100.ok
 
 report:
 	@ECHO ""
diff --git a/src/testdir/test100.in b/src/testdir/test100.in
--- a/src/testdir/test100.in
+++ b/src/testdir/test100.in
@@ -17,6 +17,7 @@ STARTTEST
 :0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
 :call FillBuffer()
 :call feedkeys(":earlier 10\n", 't')
+:
 :call UndoLevel()
 :set ff=unix
 :%w! test.out
@@ -25,6 +26,7 @@ STARTTEST
 :setlocal ul=2
 :call FillBuffer()
 :call feedkeys(":earlier 10\n", 't')
+:
 :call UndoLevel()
 :setlocal ul=10
 :call UndoLevel()

Raspunde prin e-mail lui