Patch 7.4.1934
Problem: New style tests not executed with MinGW compiler.
Solution: Add new style test support. (Yegappan Lakshmanan)
Files: src/testdir/Make_ming.mak
*** ../vim-7.4.1933/src/testdir/Make_ming.mak 2016-04-02 22:24:15.304417512
+0200
--- src/testdir/Make_ming.mak 2016-06-13 22:51:25.777338859 +0200
***************
*** 45,102 ****
# Must run test1 first to create small.vim.
$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
! .SUFFIXES: .in .out
! vimall: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI)
$(SCRIPTS_WIN32)
echo ALL DONE
! nongui: fixff $(SCRIPTS_FIRST) $(SCRIPTS)
echo ALL DONE
benchmark: $(SCRIPTS_BENCH)
! small:
echo ALL DONE
! gui: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI)
echo ALL DONE
! win32: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
echo ALL DONE
fixff:
- # TODO: find a way to avoid changing the distributed files.
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
test_getcwd.ok test_wordcount.ok
clean:
! -$(DEL) *.out
! -$(DEL) test.ok
! -$(DEL) small.vim
! -$(DEL) tiny.vim
! -$(DEL) mbyte.vim
! -$(DEL) mzscheme.vim
! -$(DEL) lua.vim
! -$(DELDIR) Xdir1
! -$(DELDIR) Xfind
! -$(DEL) X*
! -$(DEL) viminfo
.in.out:
! $(CP) $*.ok test.ok
$(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $*.in
! diff test.out $*.ok
! -$(DEL) $*.out
! $(MV) test.out $*.out
! -$(DELDIR) Xdir1
! -$(DELDIR) Xfind
! -$(DEL) X*
! -$(DEL) test.ok
! -$(DEL) viminfo
bench_re_freeze.out: bench_re_freeze.vim
-$(DEL) benchmark.out
$(VIMPROG) -u dos.vim $(NO_PLUGIN) $*.in
$(CAT) benchmark.out
--- 45,121 ----
# Must run test1 first to create small.vim.
$(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
! .SUFFIXES: .in .out .res .vim
! vimall: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI)
$(SCRIPTS_WIN32) newtests
echo ALL DONE
! nongui: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests
echo ALL DONE
benchmark: $(SCRIPTS_BENCH)
! small: nolog
echo ALL DONE
! gui: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests
echo ALL DONE
! win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
newtests
echo ALL DONE
+ # TODO: find a way to avoid changing the distributed files.
fixff:
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
test_getcwd.ok test_wordcount.ok
clean:
! -@if exist *.out $(DEL) *.out
! -@if exist *.failed $(DEL) *.failed
! -@if exist *.res $(DEL) *.res
! -@if exist test.in $(DEL) test.in
! -@if exist test.ok $(DEL) test.ok
! -@if exist small.vim $(DEL) small.vim
! -@if exist tiny.vim $(DEL) tiny.vim
! -@if exist mbyte.vim $(DEL) mbyte.vim
! -@if exist mzscheme.vim $(DEL) mzscheme.vim
! -@if exist lua.vim $(DEL) lua.vim
! -@if exist Xdir1 $(DELDIR) Xdir1
! -@if exist Xfind $(DELDIR) Xfind
! -@if exist X* $(DEL) X*
! -@if exist viminfo $(DEL) viminfo
! -@if exist test.log $(DEL) test.log
! -@if exist messages $(DEL) messages
.in.out:
! -@if exist $*.ok $(CP) $*.ok test.ok
$(VIMPROG) -u dos.vim $(NO_PLUGIN) -s dotest.in $*.in
! @diff test.out $*.ok
! -@if exist $*.out $(DEL) $*.out
! @$(MV) test.out $*.out
! -@if exist Xdir1 $(DELDIR) Xdir1
! -@if exist Xfind $(DELDIR) Xfind
! -@if exist X* $(DEL) X*
! -@if exist test.ok $(DEL) test.ok
! -@if exist viminfo $(DEL) viminfo
!
! nolog:
! -@if exist test.log $(DEL) test.log
! -@if exist messages $(DEL) messages
bench_re_freeze.out: bench_re_freeze.vim
-$(DEL) benchmark.out
$(VIMPROG) -u dos.vim $(NO_PLUGIN) $*.in
$(CAT) benchmark.out
+
+ # 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.
+
+ newtests: $(NEW_TESTS)
+
+ .vim.res:
+ $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim
+
*** ../vim-7.4.1933/src/version.c 2016-06-13 22:47:57.723576003 +0200
--- src/version.c 2016-06-13 22:53:25.140055655 +0200
***************
*** 755,756 ****
--- 755,758 ----
{ /* Add new patch number below this line */
+ /**/
+ 1934,
/**/
--
Momento mori, ergo carpe diem
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
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.
