Skip to content
Permalink
Browse files

updated for version 7.4.033

Problem:    When the terminal has only 20 lines test 92 and 93 overwrite the
            input file.
Solution:   Explicitly write test.out. Check that the terminal is large enough
            to run the tests.  (Hirohito Higashi)
  • Loading branch information...
brammool committed Sep 22, 2013
1 parent baca7f7 commit 6848c8b561e6c35a3e646c99a82e03c4aa5def92
Showing with 14 additions and 4 deletions.
  1. +6 −2 src/testdir/Makefile
  2. +4 −0 src/testdir/test1.in
  3. +1 −1 src/testdir/test92.in
  4. +1 −1 src/testdir/test93.in
  5. +2 −0 src/version.c
@@ -58,9 +58,13 @@ clean:
-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*

test1.out: test1.in
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
$(RUN_VIM) $*.in
@/bin/sh -c "if diff test.out $*.ok; \
@/bin/sh -c "if test -e wrongtermsize; \
then echo; \
echo test1 FAILED - terminal size must be 80x24 or larger; \
echo; exit 1; \
elif diff test.out $*.ok; \
then mv -f test.out $*.out; \
else echo; \
echo test1 FAILED - Something basic is wrong; \
@@ -18,6 +18,10 @@ Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
Similar logic is applied to the +lua feature, using lua.vim.

STARTTEST
:" If columns or lines are too small, create wrongtermsize.
:" (Some tests will fail. When columns and/or lines are small)
:if &lines < 24 || &columns < 80 | sp another | w! wrongtermsize | qa! | endif
:"
:" Write a single line to test.out to check if testing works at all.
:%d
athis is a test:w! test.out
@@ -33,7 +33,7 @@ j016|3zl:split
:mksession! test.out
:new test.out
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
:w
:w! test.out
:qa!
ENDTEST

@@ -33,7 +33,7 @@ j016|3zl:split
:mksession! test.out
:new test.out
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
:w
:w! test.out
:qa!
ENDTEST

@@ -738,6 +738,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
33,
/**/
32,
/**/

0 comments on commit 6848c8b

Please sign in to comment.
You can’t perform that action at this time.