|
 |
4c6f4a2 |
To: vim_dev@googlegroups.com
|
|
|
4c6f4a2 |
Subject: Patch 7.4.231
|
|
|
4c6f4a2 |
Fcc: outbox
|
|
|
4c6f4a2 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
4c6f4a2 |
Mime-Version: 1.0
|
|
|
4c6f4a2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
4c6f4a2 |
Content-Transfer-Encoding: 8bit
|
|
|
4c6f4a2 |
------------
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
Patch 7.4.231
|
|
|
4c6f4a2 |
Problem: An error in ":options" is not caught by the tests.
|
|
|
4c6f4a2 |
Solution: Add a test for ":options". Set $VIMRUNTIME for the tests so that
|
|
|
4c6f4a2 |
it uses the current runtime files instead of the installed ones.
|
|
|
4c6f4a2 |
Files: src/Makefile, src/testdir/Makefile, src/testdir/test_options.in,
|
|
|
4c6f4a2 |
src/testdir/test_options.ok, src/testdir/Make_amiga.mak,
|
|
|
4c6f4a2 |
src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
|
|
|
4c6f4a2 |
src/testdir/Make_os2.mak, src/testdir/Make_vms.mms
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/Makefile 2014-03-27 17:40:53.384696360 +0100
|
|
|
4c6f4a2 |
--- src/Makefile 2014-04-01 13:49:14.025089820 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 1867,1873 ****
|
|
|
4c6f4a2 |
-if test $(VIMTARGET) != vim -a ! -r vim; then \
|
|
|
4c6f4a2 |
ln -s $(VIMTARGET) vim; \
|
|
|
4c6f4a2 |
fi
|
|
|
4c6f4a2 |
! cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)
|
|
|
4c6f4a2 |
$(MAKE) -f Makefile unittest
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
unittesttargets:
|
|
|
4c6f4a2 |
--- 1867,1873 ----
|
|
|
4c6f4a2 |
-if test $(VIMTARGET) != vim -a ! -r vim; then \
|
|
|
4c6f4a2 |
ln -s $(VIMTARGET) vim; \
|
|
|
4c6f4a2 |
fi
|
|
|
4c6f4a2 |
! cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
|
|
|
4c6f4a2 |
$(MAKE) -f Makefile unittest
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
unittesttargets:
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 1880,1885 ****
|
|
|
4c6f4a2 |
--- 1880,1886 ----
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
# Run individual test, assuming that Vim was already compiled.
|
|
|
4c6f4a2 |
test1 test2 test3 test4 test5 test6 test7 test8 test9 \
|
|
|
4c6f4a2 |
+ test_options \
|
|
|
4c6f4a2 |
test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \
|
|
|
4c6f4a2 |
test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
|
|
|
4c6f4a2 |
test30 test31 test32 test33 test34 test35 test36 test37 test38 test39 \
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 1890,1896 ****
|
|
|
4c6f4a2 |
test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
|
|
|
4c6f4a2 |
test90 test91 test92 test93 test94 test95 test96 test97 test98 test99 \
|
|
|
4c6f4a2 |
test100 test101 test102 test103 test104 test105 test106 test107:
|
|
|
4c6f4a2 |
! cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET)
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
testclean:
|
|
|
4c6f4a2 |
cd testdir; $(MAKE) -f Makefile clean
|
|
|
4c6f4a2 |
--- 1891,1897 ----
|
|
|
4c6f4a2 |
test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
|
|
|
4c6f4a2 |
test90 test91 test92 test93 test94 test95 test96 test97 test98 test99 \
|
|
|
4c6f4a2 |
test100 test101 test102 test103 test104 test105 test106 test107:
|
|
|
4c6f4a2 |
! cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
testclean:
|
|
|
4c6f4a2 |
cd testdir; $(MAKE) -f Makefile clean
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/Makefile 2014-03-12 19:41:37.100948866 +0100
|
|
|
4c6f4a2 |
--- src/testdir/Makefile 2014-04-01 13:48:07.593090734 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 3,8 ****
|
|
|
4c6f4a2 |
--- 3,9 ----
|
|
|
4c6f4a2 |
#
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
VIMPROG = ../vim
|
|
|
4c6f4a2 |
+ SCRIPTSOURCE = ../../runtime
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
# Uncomment this line to use valgrind for memory leaks and extra warnings.
|
|
|
4c6f4a2 |
# The output goes into a file "valgrind.testN"
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 31,37 ****
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
4c6f4a2 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
4c6f4a2 |
! test104.out test105.out test106.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
SCRIPTS_GUI = test16.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
--- 32,39 ----
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
4c6f4a2 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
4c6f4a2 |
! test104.out test105.out test106.out \
|
|
|
4c6f4a2 |
! test_options.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
SCRIPTS_GUI = test16.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 53,59 ****
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
RM_ON_RUN = test.out X* viminfo
|
|
|
4c6f4a2 |
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
|
|
|
4c6f4a2 |
! RUN_VIM = $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
clean:
|
|
|
4c6f4a2 |
-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
|
|
|
4c6f4a2 |
--- 55,61 ----
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
RM_ON_RUN = test.out X* viminfo
|
|
|
4c6f4a2 |
RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
|
|
|
4c6f4a2 |
! RUN_VIM = export VIMRUNTIME=$(SCRIPTSOURCE); $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
clean:
|
|
|
4c6f4a2 |
-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/test_options.in 2014-04-01 14:07:21.057074867 +0200
|
|
|
4c6f4a2 |
--- src/testdir/test_options.in 2014-04-01 13:19:34.073114305 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 0 ****
|
|
|
4c6f4a2 |
--- 1,17 ----
|
|
|
4c6f4a2 |
+ Test for ":options".
|
|
|
4c6f4a2 |
+
|
|
|
4c6f4a2 |
+ STARTTEST
|
|
|
4c6f4a2 |
+ :so small.vim
|
|
|
4c6f4a2 |
+ :let caught = 'ok'
|
|
|
4c6f4a2 |
+ :try
|
|
|
4c6f4a2 |
+ :options
|
|
|
4c6f4a2 |
+ :catch
|
|
|
4c6f4a2 |
+ :let caught = v:throwpoint . "\n" . v:exception
|
|
|
4c6f4a2 |
+ :endtry
|
|
|
4c6f4a2 |
+ :buf 1
|
|
|
4c6f4a2 |
+ :$put =caught
|
|
|
4c6f4a2 |
+ :/^result/,$w! test.out
|
|
|
4c6f4a2 |
+ :qa!
|
|
|
4c6f4a2 |
+ ENDTEST
|
|
|
4c6f4a2 |
+
|
|
|
4c6f4a2 |
+ result
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/test_options.ok 2014-04-01 14:07:21.065074867 +0200
|
|
|
4c6f4a2 |
--- src/testdir/test_options.ok 2014-04-01 13:04:45.041126534 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 0 ****
|
|
|
4c6f4a2 |
--- 1,2 ----
|
|
|
4c6f4a2 |
+ result
|
|
|
4c6f4a2 |
+ ok
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/Make_amiga.mak 2014-03-12 19:41:37.096948866 +0100
|
|
|
4c6f4a2 |
--- src/testdir/Make_amiga.mak 2014-04-01 13:13:31.561119292 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 35,41 ****
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
4c6f4a2 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
4c6f4a2 |
! test104.out test105.out test106.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
.SUFFIXES: .in .out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
--- 35,42 ----
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
4c6f4a2 |
test99.out test100.out test101.out test102.out test103.out \
|
|
|
4c6f4a2 |
! test104.out test105.out test106.out \
|
|
|
4c6f4a2 |
! test_options.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
.SUFFIXES: .in .out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 158,160 ****
|
|
|
4c6f4a2 |
--- 159,162 ----
|
|
|
4c6f4a2 |
test104.out: test104.in
|
|
|
4c6f4a2 |
test105.out: test105.in
|
|
|
4c6f4a2 |
test106.out: test106.in
|
|
|
4c6f4a2 |
+ test_options.out: test_options.in
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/Make_dos.mak 2014-03-12 19:41:37.096948866 +0100
|
|
|
4c6f4a2 |
--- src/testdir/Make_dos.mak 2014-04-01 13:14:07.909118792 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 34,40 ****
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
SCRIPTS32 = test50.out test70.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
--- 34,41 ----
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out \
|
|
|
4c6f4a2 |
! test_options.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
SCRIPTS32 = test50.out test70.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/Make_ming.mak 2014-03-12 19:41:37.096948866 +0100
|
|
|
4c6f4a2 |
--- src/testdir/Make_ming.mak 2014-04-01 13:14:23.889118572 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 54,60 ****
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
SCRIPTS32 = test50.out test70.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
--- 54,61 ----
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out \
|
|
|
4c6f4a2 |
! test_options.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
SCRIPTS32 = test50.out test70.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/Make_os2.mak 2014-03-12 19:41:37.096948866 +0100
|
|
|
4c6f4a2 |
--- src/testdir/Make_os2.mak 2014-04-01 13:14:34.377118428 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 36,42 ****
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
.SUFFIXES: .in .out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
--- 36,43 ----
|
|
|
4c6f4a2 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
4c6f4a2 |
test94.out test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out \
|
|
|
4c6f4a2 |
! test_options.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
.SUFFIXES: .in .out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/testdir/Make_vms.mms 2014-03-12 19:41:37.096948866 +0100
|
|
|
4c6f4a2 |
--- src/testdir/Make_vms.mms 2014-04-01 13:14:47.821118243 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 95,101 ****
|
|
|
4c6f4a2 |
test90.out test91.out test92.out test93.out test94.out \
|
|
|
4c6f4a2 |
test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
# Known problems:
|
|
|
4c6f4a2 |
# test17: ?
|
|
|
4c6f4a2 |
--- 95,102 ----
|
|
|
4c6f4a2 |
test90.out test91.out test92.out test93.out test94.out \
|
|
|
4c6f4a2 |
test95.out test96.out test98.out test99.out \
|
|
|
4c6f4a2 |
test100.out test101.out test103.out test104.out \
|
|
|
4c6f4a2 |
! test105.out test106.out \
|
|
|
4c6f4a2 |
! test_options.out
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
# Known problems:
|
|
|
4c6f4a2 |
# test17: ?
|
|
|
4c6f4a2 |
*** ../vim-7.4.230/src/version.c 2014-04-01 12:26:40.245157964 +0200
|
|
|
4c6f4a2 |
--- src/version.c 2014-04-01 13:14:57.549118109 +0200
|
|
|
4c6f4a2 |
***************
|
|
|
4c6f4a2 |
*** 736,737 ****
|
|
|
4c6f4a2 |
--- 736,739 ----
|
|
|
4c6f4a2 |
{ /* Add new patch number below this line */
|
|
|
4c6f4a2 |
+ /**/
|
|
|
4c6f4a2 |
+ 231,
|
|
|
4c6f4a2 |
/**/
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
--
|
|
|
4c6f4a2 |
hundred-and-one symptoms of being an internet addict:
|
|
|
4c6f4a2 |
11. You find yourself typing "com" after every period when using a word
|
|
|
4c6f4a2 |
processor.com
|
|
|
4c6f4a2 |
|
|
|
4c6f4a2 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
4c6f4a2 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
4c6f4a2 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
4c6f4a2 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|