Skip to content

Commit 8f926bf

Browse files
committed
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)
1 parent c2ec86c commit 8f926bf

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

src/testdir/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ clean:
5858
-rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
5959

6060
test1.out: test1.in
61-
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
61+
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
6262
$(RUN_VIM) $*.in
63-
@/bin/sh -c "if diff test.out $*.ok; \
63+
@/bin/sh -c "if test -e wrongtermsize; \
64+
then echo; \
65+
echo test1 FAILED - terminal size must be 80x24 or larger; \
66+
echo; exit 1; \
67+
elif diff test.out $*.ok; \
6468
then mv -f test.out $*.out; \
6569
else echo; \
6670
echo test1 FAILED - Something basic is wrong; \

src/testdir/test1.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
1818
Similar logic is applied to the +lua feature, using lua.vim.
1919

2020
STARTTEST
21+
:" If columns or lines are too small, create wrongtermsize.
22+
:" (Some tests will fail. When columns and/or lines are small)
23+
:if &lines < 24 || &columns < 80 | sp another | w! wrongtermsize | qa! | endif
24+
:"
2125
:" Write a single line to test.out to check if testing works at all.
2226
:%d
2327
athis is a test:w! test.out

src/testdir/test92.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ j016|3zl:split
3333
:mksession! test.out
3434
:new test.out
3535
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
36-
:w
36+
:w! test.out
3737
:qa!
3838
ENDTEST
3939

src/testdir/test93.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ j016|3zl:split
3333
:mksession! test.out
3434
:new test.out
3535
:v/\(^ *normal! 0\|^ *exe 'normal!\)/d
36-
:w
36+
:w! test.out
3737
:qa!
3838
ENDTEST
3939

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
33,
741743
/**/
742744
32,
743745
/**/

0 commit comments

Comments
 (0)