[packages/vim.git] / 7.2.022

To: vim-dev@vim.org
Subject: Patch 7.2.022 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.2.022 (extra)
Problem:    Testing is not possible when compiling with MingW.
Solution:   Add a MingW specific test Makefile. (Bill McCarthy)
Files:	    Filelist, src/testdir/Make_ming.mak


*** ../vim-7.2.021/Filelist	Sun Jul 13 19:33:31 2008
--- Filelist	Sun Sep 14 21:47:01 2008
***************
*** 285,290 ****
--- 285,291 ----
  		src/proto/os_win32.pro \
  		src/proto/os_mswin.pro \
  		src/testdir/Make_dos.mak \
+ 		src/testdir/Make_ming.mak \
  		src/testdir/dos.vim \
  		src/uninstal.c \
  		src/vim.def \
*** ../vim-7.2.021/src/testdir/Make_ming.mak	Sat Sep 20 16:25:06 2008
--- src/testdir/Make_ming.mak	Sat Sep 20 16:25:58 2008
***************
*** 0 ****
--- 1,91 ----
+ # Makefile to run tests for Vim, on Dos-like machines
+ # with sh.exe or zsh.exe in the path or not.
+ #
+ # Author: Bill McCarthy
+ #
+ # Note that test54 has been removed until it is fixed.
+ #
+ # Requires a set of Unix tools: echo, diff, etc.
+ 
+ ifneq (sh.exe, $(SHELL))
+ DEL = rm -f
+ MV = mv
+ CP = cp
+ DIRSLASH = /
+ else
+ DEL = del
+ MV = rename
+ CP = copy
+ DIRSLASH = \\
+ endif
+ 
+ VIMPROG = ..$(DIRSLASH)vim
+ 
+ # Omitted:
+ # test2		"\\tmp" doesn't work.
+ # test10	'errorformat' is different
+ # test12	can't unlink a swap file
+ # test25	uses symbolic link
+ # test27	can't edit file with "*" in file name
+ # test31	16 bit version runs out of memory...
+ 
+ SCRIPTS16 =	test1.out test19.out test20.out test22.out \
+ 		test23.out test24.out test28.out test29.out \
+ 		test35.out test36.out test43.out \
+ 		test44.out test45.out test46.out test47.out \
+ 		test48.out test51.out test53.out            \
+ 		test55.out test56.out test57.out test58.out test59.out \
+ 		test60.out test61.out test62.out test63.out test64.out
+ 
+ # Had to remove test54 which doesn't work yet.
+ #		                                 test54.out
+ 
+ SCRIPTS =	test3.out test4.out test5.out test6.out test7.out \
+ 		test8.out test9.out test11.out test13.out test14.out \
+ 		test15.out test17.out test18.out test21.out test26.out \
+ 		test30.out test31.out test32.out test33.out test34.out \
+ 		test37.out test38.out test39.out test40.out test41.out \
+ 		test42.out test52.out test65.out
+ 
+ SCRIPTS32 =	test50.out
+ 
+ SCRIPTS_GUI = test16.out
+ 
+ .SUFFIXES: .in .out
+ 
+ vimall:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
+ 	echo ALL DONE
+ 
+ nongui:	fixff $(SCRIPTS16) $(SCRIPTS)
+ 	echo ALL DONE
+ 
+ small:
+ 	echo ALL DONE
+ 
+ gui:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
+ 	echo ALL DONE
+ 
+ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
+ 	echo ALL DONE
+ 
+ fixff:
+ 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
+ 
+ clean:
+ 	-$(DEL) *.out
+ 	-$(DEL) test.ok
+ 	-$(DEL) small.vim
+ 	-$(DEL) tiny.vim
+ 	-$(DEL) mbyte.vim
+ 	-$(DEL) X*
+ 	-$(DEL) viminfo
+ 
+ .in.out:
+ 	$(CP) $*.ok test.ok
+ 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
+ 	diff test.out $*.ok
+ 	-$(DEL) $*.out
+ 	$(MV) test.out $*.out
+ 	-$(DEL) X*
+ 	-$(DEL) test.ok
+ 	-$(DEL) viminfo
*** ../vim-7.2.021/src/version.c	Thu Sep 18 21:29:07 2008
--- src/version.c	Sat Sep 20 16:25:16 2008
***************
*** 678,679 ****
--- 678,681 ----
  {   /* Add new patch number below this line */
+ /**/
+     22,
  /**/

-- 
Where do you want to crash today?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
Commit	Line	Data
3db12ce3 ER	1	To: vim-dev@vim.org
	2	Subject: Patch 7.2.022 (extra)
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.2.022 (extra)
	11	Problem: Testing is not possible when compiling with MingW.
	12	Solution: Add a MingW specific test Makefile. (Bill McCarthy)
	13	Files: Filelist, src/testdir/Make_ming.mak
	14
	15
	16	*** ../vim-7.2.021/Filelist Sun Jul 13 19:33:31 2008
	17	--- Filelist Sun Sep 14 21:47:01 2008
	18	***************
	19	* 285,290 **
	20	--- 285,291 ----
	21	src/proto/os_win32.pro \
	22	src/proto/os_mswin.pro \
	23	src/testdir/Make_dos.mak \
	24	+ src/testdir/Make_ming.mak \
	25	src/testdir/dos.vim \
	26	src/uninstal.c \
	27	src/vim.def \
	28	*** ../vim-7.2.021/src/testdir/Make_ming.mak Sat Sep 20 16:25:06 2008
	29	--- src/testdir/Make_ming.mak Sat Sep 20 16:25:58 2008
	30	***************
	31	* 0 **
	32	--- 1,91 ----
	33	+ # Makefile to run tests for Vim, on Dos-like machines
	34	+ # with sh.exe or zsh.exe in the path or not.
	35	+ #
	36	+ # Author: Bill McCarthy
	37	+ #
	38	+ # Note that test54 has been removed until it is fixed.
	39	+ #
	40	+ # Requires a set of Unix tools: echo, diff, etc.
	41	+
	42	+ ifneq (sh.exe, $(SHELL))
	43	+ DEL = rm -f
	44	+ MV = mv
	45	+ CP = cp
	46	+ DIRSLASH = /
	47	+ else
	48	+ DEL = del
	49	+ MV = rename
	50	+ CP = copy
	51	+ DIRSLASH = \\
	52	+ endif
	53	+
	54	+ VIMPROG = ..$(DIRSLASH)vim
	55	+
	56	+ # Omitted:
	57	+ # test2 "\\tmp" doesn't work.
	58	+ # test10 'errorformat' is different
	59	+ # test12 can't unlink a swap file
	60	+ # test25 uses symbolic link
	61	+ # test27 can't edit file with "*" in file name
	62	+ # test31 16 bit version runs out of memory...
	63	+
	64	+ SCRIPTS16 = test1.out test19.out test20.out test22.out \
65	+ test23.out test24.out test28.out test29.out \
66	+ test35.out test36.out test43.out \
67	+ test44.out test45.out test46.out test47.out \
68	+ test48.out test51.out test53.out \
69	+ test55.out test56.out test57.out test58.out test59.out \
70	+ test60.out test61.out test62.out test63.out test64.out
71	+
72	+ # Had to remove test54 which doesn't work yet.
73	+ # test54.out
74	+
75	+ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
76	+ test8.out test9.out test11.out test13.out test14.out \
77	+ test15.out test17.out test18.out test21.out test26.out \
78	+ test30.out test31.out test32.out test33.out test34.out \
79	+ test37.out test38.out test39.out test40.out test41.out \
80	+ test42.out test52.out test65.out
81	+
82	+ SCRIPTS32 = test50.out
83	+
84	+ SCRIPTS_GUI = test16.out
85	+
86	+ .SUFFIXES: .in .out
87	+
88	+ vimall: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
89	+ echo ALL DONE
90	+
91	+ nongui: fixff $(SCRIPTS16) $(SCRIPTS)
92	+ echo ALL DONE
93	+
94	+ small:
95	+ echo ALL DONE
96	+
97	+ gui: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
98	+ echo ALL DONE
99	+
100	+ win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
101	+ echo ALL DONE
102	+
103	+ fixff:
104	+ -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos\|upd" +q .in .ok
105	+
106	+ clean:
107	+ -$(DEL) *.out
108	+ -$(DEL) test.ok
109	+ -$(DEL) small.vim
110	+ -$(DEL) tiny.vim
111	+ -$(DEL) mbyte.vim
112	+ -$(DEL) X*
113	+ -$(DEL) viminfo
114	+
115	+ .in.out:
116	+ $(CP) $*.ok test.ok
117	+ $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
118	+ diff test.out $*.ok
119	+ -$(DEL) $*.out
120	+ $(MV) test.out $*.out
121	+ -$(DEL) X*
122	+ -$(DEL) test.ok
123	+ -$(DEL) viminfo
124	*** ../vim-7.2.021/src/version.c Thu Sep 18 21:29:07 2008
125	--- src/version.c Sat Sep 20 16:25:16 2008
126	***************
127	* 678,679 **
128	--- 678,681 ----
129	{ /* Add new patch number below this line */
130	+ /**/
131	+ 22,
132	/**/
133
134	--
135	Where do you want to crash today?
136
137	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
138	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
139	\\\ download, build and distribute -- http://www.A-A-P.org ///
140	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///