|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.033
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.033
|
|
|
8b9a1c |
Problem: When the terminal has only 20 lines test 92 and 93 overwrite the
|
|
|
8b9a1c |
input file.
|
|
|
8b9a1c |
Solution: Explicitly write test.out. Check that the terminal is large enough
|
|
|
8b9a1c |
to run the tests. (Hirohito Higashi)
|
|
|
8b9a1c |
Files: src/testdir/test92.in, src/testdir/test93.in,
|
|
|
8b9a1c |
src/testdir/test1.in, src/testdir/Makefile
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.032/src/testdir/test92.in 2013-04-18 23:33:45.000000000 +0200
|
|
|
8b9a1c |
--- src/testdir/test92.in 2013-09-22 14:45:06.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 33,39 ****
|
|
|
8b9a1c |
:mksession! test.out
|
|
|
8b9a1c |
:new test.out
|
|
|
8b9a1c |
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
|
|
|
8b9a1c |
! :w
|
|
|
8b9a1c |
:qa!
|
|
|
8b9a1c |
ENDTEST
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--- 33,39 ----
|
|
|
8b9a1c |
:mksession! test.out
|
|
|
8b9a1c |
:new test.out
|
|
|
8b9a1c |
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
|
|
|
8b9a1c |
! :w! test.out
|
|
|
8b9a1c |
:qa!
|
|
|
8b9a1c |
ENDTEST
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.032/src/testdir/test93.in 2013-02-26 17:13:01.000000000 +0100
|
|
|
8b9a1c |
--- src/testdir/test93.in 2013-09-22 14:45:17.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 33,39 ****
|
|
|
8b9a1c |
:mksession! test.out
|
|
|
8b9a1c |
:new test.out
|
|
|
8b9a1c |
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
|
|
|
8b9a1c |
! :w
|
|
|
8b9a1c |
:qa!
|
|
|
8b9a1c |
ENDTEST
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--- 33,39 ----
|
|
|
8b9a1c |
:mksession! test.out
|
|
|
8b9a1c |
:new test.out
|
|
|
8b9a1c |
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
|
|
|
8b9a1c |
! :w! test.out
|
|
|
8b9a1c |
:qa!
|
|
|
8b9a1c |
ENDTEST
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.032/src/testdir/test1.in 2012-04-05 16:37:37.000000000 +0200
|
|
|
8b9a1c |
--- src/testdir/test1.in 2013-09-22 14:52:43.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 18,23 ****
|
|
|
8b9a1c |
--- 18,27 ----
|
|
|
8b9a1c |
Similar logic is applied to the +lua feature, using lua.vim.
|
|
|
8b9a1c |
|
|
|
8b9a1c |
STARTTEST
|
|
|
8b9a1c |
+ :" If columns or lines are too small, create wrongtermsize.
|
|
|
8b9a1c |
+ :" (Some tests will fail. When columns and/or lines are small)
|
|
|
8b9a1c |
+ :if &lines < 24 || &columns < 80 | sp another | w! wrongtermsize | qa! | endif
|
|
|
8b9a1c |
+ :"
|
|
|
8b9a1c |
:" Write a single line to test.out to check if testing works at all.
|
|
|
8b9a1c |
:%d
|
|
|
8b9a1c |
athis is a test?:w! test.out
|
|
|
8b9a1c |
*** ../vim-7.4.032/src/testdir/Makefile 2013-09-19 17:00:14.000000000 +0200
|
|
|
8b9a1c |
--- src/testdir/Makefile 2013-09-22 14:54:39.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 58,66 ****
|
|
|
8b9a1c |
-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
|
|
|
8b9a1c |
|
|
|
8b9a1c |
test1.out: test1.in
|
|
|
8b9a1c |
! -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
|
|
|
8b9a1c |
$(RUN_VIM) $*.in
|
|
|
8b9a1c |
! @/bin/sh -c "if diff test.out $*.ok; \
|
|
|
8b9a1c |
then mv -f test.out $*.out; \
|
|
|
8b9a1c |
else echo; \
|
|
|
8b9a1c |
echo test1 FAILED - Something basic is wrong; \
|
|
|
8b9a1c |
--- 58,70 ----
|
|
|
8b9a1c |
-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
|
|
|
8b9a1c |
|
|
|
8b9a1c |
test1.out: test1.in
|
|
|
8b9a1c |
! -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
|
|
|
8b9a1c |
$(RUN_VIM) $*.in
|
|
|
8b9a1c |
! @/bin/sh -c "if test -e wrongtermsize; \
|
|
|
8b9a1c |
! then echo; \
|
|
|
8b9a1c |
! echo test1 FAILED - terminal size must be 80x24 or larger; \
|
|
|
8b9a1c |
! echo; exit 1; \
|
|
|
8b9a1c |
! elif diff test.out $*.ok; \
|
|
|
8b9a1c |
then mv -f test.out $*.out; \
|
|
|
8b9a1c |
else echo; \
|
|
|
8b9a1c |
echo test1 FAILED - Something basic is wrong; \
|
|
|
8b9a1c |
*** ../vim-7.4.032/src/version.c 2013-09-22 13:57:19.000000000 +0200
|
|
|
8b9a1c |
--- src/version.c 2013-09-22 15:02:04.000000000 +0200
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 33,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
hundred-and-one symptoms of being an internet addict:
|
|
|
8b9a1c |
248. You sign your letters with your e-mail address instead of your name.
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|