Karsten Hopp 7ef95b
To: vim-dev@vim.org
Karsten Hopp 7ef95b
Subject: Patch 7.2.022 (extra)
Karsten Hopp 7ef95b
Fcc: outbox
Karsten Hopp 7ef95b
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 7ef95b
Mime-Version: 1.0
Karsten Hopp 7ef95b
Content-Type: text/plain; charset=ISO-8859-1
Karsten Hopp 7ef95b
Content-Transfer-Encoding: 8bit
Karsten Hopp 7ef95b
------------
Karsten Hopp 7ef95b
Karsten Hopp 7ef95b
Patch 7.2.022 (extra)
Karsten Hopp 7ef95b
Problem:    Testing is not possible when compiling with MingW.
Karsten Hopp 7ef95b
Solution:   Add a MingW specific test Makefile. (Bill McCarthy)
Karsten Hopp 7ef95b
Files:	    Filelist, src/testdir/Make_ming.mak
Karsten Hopp 7ef95b
Karsten Hopp 7ef95b
Karsten Hopp 7ef95b
*** ../vim-7.2.021/Filelist	Sun Jul 13 19:33:31 2008
Karsten Hopp 7ef95b
--- Filelist	Sun Sep 14 21:47:01 2008
Karsten Hopp 7ef95b
***************
Karsten Hopp 7ef95b
*** 285,290 ****
Karsten Hopp 7ef95b
--- 285,291 ----
Karsten Hopp 7ef95b
  		src/proto/os_win32.pro \
Karsten Hopp 7ef95b
  		src/proto/os_mswin.pro \
Karsten Hopp 7ef95b
  		src/testdir/Make_dos.mak \
Karsten Hopp 7ef95b
+ 		src/testdir/Make_ming.mak \
Karsten Hopp 7ef95b
  		src/testdir/dos.vim \
Karsten Hopp 7ef95b
  		src/uninstal.c \
Karsten Hopp 7ef95b
  		src/vim.def \
Karsten Hopp 7ef95b
*** ../vim-7.2.021/src/testdir/Make_ming.mak	Sat Sep 20 16:25:06 2008
Karsten Hopp 7ef95b
--- src/testdir/Make_ming.mak	Sat Sep 20 16:25:58 2008
Karsten Hopp 7ef95b
***************
Karsten Hopp 7ef95b
*** 0 ****
Karsten Hopp 7ef95b
--- 1,91 ----
Karsten Hopp 7ef95b
+ # Makefile to run tests for Vim, on Dos-like machines
Karsten Hopp 7ef95b
+ # with sh.exe or zsh.exe in the path or not.
Karsten Hopp 7ef95b
+ #
Karsten Hopp 7ef95b
+ # Author: Bill McCarthy
Karsten Hopp 7ef95b
+ #
Karsten Hopp 7ef95b
+ # Note that test54 has been removed until it is fixed.
Karsten Hopp 7ef95b
+ #
Karsten Hopp 7ef95b
+ # Requires a set of Unix tools: echo, diff, etc.
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ ifneq (sh.exe, $(SHELL))
Karsten Hopp 7ef95b
+ DEL = rm -f
Karsten Hopp 7ef95b
+ MV = mv
Karsten Hopp 7ef95b
+ CP = cp
Karsten Hopp 7ef95b
+ DIRSLASH = /
Karsten Hopp 7ef95b
+ else
Karsten Hopp 7ef95b
+ DEL = del
Karsten Hopp 7ef95b
+ MV = rename
Karsten Hopp 7ef95b
+ CP = copy
Karsten Hopp 7ef95b
+ DIRSLASH = \\
Karsten Hopp 7ef95b
+ endif
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ VIMPROG = ..$(DIRSLASH)vim
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ # Omitted:
Karsten Hopp 7ef95b
+ # test2		"\\tmp" doesn't work.
Karsten Hopp 7ef95b
+ # test10	'errorformat' is different
Karsten Hopp 7ef95b
+ # test12	can't unlink a swap file
Karsten Hopp 7ef95b
+ # test25	uses symbolic link
Karsten Hopp 7ef95b
+ # test27	can't edit file with "*" in file name
Karsten Hopp 7ef95b
+ # test31	16 bit version runs out of memory...
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ SCRIPTS16 =	test1.out test19.out test20.out test22.out \
Karsten Hopp 7ef95b
+ 		test23.out test24.out test28.out test29.out \
Karsten Hopp 7ef95b
+ 		test35.out test36.out test43.out \
Karsten Hopp 7ef95b
+ 		test44.out test45.out test46.out test47.out \
Karsten Hopp 7ef95b
+ 		test48.out test51.out test53.out            \
Karsten Hopp 7ef95b
+ 		test55.out test56.out test57.out test58.out test59.out \
Karsten Hopp 7ef95b
+ 		test60.out test61.out test62.out test63.out test64.out
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ # Had to remove test54 which doesn't work yet.
Karsten Hopp 7ef95b
+ #		                                 test54.out
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
Karsten Hopp 7ef95b
+ 		test8.out test9.out test11.out test13.out test14.out \
Karsten Hopp 7ef95b
+ 		test15.out test17.out test18.out test21.out test26.out \
Karsten Hopp 7ef95b
+ 		test30.out test31.out test32.out test33.out test34.out \
Karsten Hopp 7ef95b
+ 		test37.out test38.out test39.out test40.out test41.out \
Karsten Hopp 7ef95b
+ 		test42.out test52.out test65.out
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ SCRIPTS32 =	test50.out
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ SCRIPTS_GUI = test16.out
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ .SUFFIXES: .in .out
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ vimall:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
Karsten Hopp 7ef95b
+ 	echo ALL DONE
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ nongui:	fixff $(SCRIPTS16) $(SCRIPTS)
Karsten Hopp 7ef95b
+ 	echo ALL DONE
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ small:
Karsten Hopp 7ef95b
+ 	echo ALL DONE
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ gui:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
Karsten Hopp 7ef95b
+ 	echo ALL DONE
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
Karsten Hopp 7ef95b
+ 	echo ALL DONE
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ fixff:
Karsten Hopp 7ef95b
+ 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ clean:
Karsten Hopp 7ef95b
+ 	-$(DEL) *.out
Karsten Hopp 7ef95b
+ 	-$(DEL) test.ok
Karsten Hopp 7ef95b
+ 	-$(DEL) small.vim
Karsten Hopp 7ef95b
+ 	-$(DEL) tiny.vim
Karsten Hopp 7ef95b
+ 	-$(DEL) mbyte.vim
Karsten Hopp 7ef95b
+ 	-$(DEL) X*
Karsten Hopp 7ef95b
+ 	-$(DEL) viminfo
Karsten Hopp 7ef95b
+ 
Karsten Hopp 7ef95b
+ .in.out:
Karsten Hopp 7ef95b
+ 	$(CP) $*.ok test.ok
Karsten Hopp 7ef95b
+ 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
Karsten Hopp 7ef95b
+ 	diff test.out $*.ok
Karsten Hopp 7ef95b
+ 	-$(DEL) $*.out
Karsten Hopp 7ef95b
+ 	$(MV) test.out $*.out
Karsten Hopp 7ef95b
+ 	-$(DEL) X*
Karsten Hopp 7ef95b
+ 	-$(DEL) test.ok
Karsten Hopp 7ef95b
+ 	-$(DEL) viminfo
Karsten Hopp 7ef95b
*** ../vim-7.2.021/src/version.c	Thu Sep 18 21:29:07 2008
Karsten Hopp 7ef95b
--- src/version.c	Sat Sep 20 16:25:16 2008
Karsten Hopp 7ef95b
***************
Karsten Hopp 7ef95b
*** 678,679 ****
Karsten Hopp 7ef95b
--- 678,681 ----
Karsten Hopp 7ef95b
  {   /* Add new patch number below this line */
Karsten Hopp 7ef95b
+ /**/
Karsten Hopp 7ef95b
+     22,
Karsten Hopp 7ef95b
  /**/
Karsten Hopp 7ef95b
Karsten Hopp 7ef95b
-- 
Karsten Hopp 7ef95b
Where do you want to crash today?
Karsten Hopp 7ef95b
Karsten Hopp 7ef95b
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 7ef95b
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 7ef95b
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 7ef95b
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///