Mercurial > vim
changeset 5363:91f6a28e010d v7.4.033
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 22 Sep 2013 15:03:38 +0200 |
| parents | ab1508486b12 |
| children | 31cdaf292bbb |
| files | src/testdir/Makefile src/testdir/test1.in src/testdir/test92.in src/testdir/test93.in src/version.c |
| diffstat | 5 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -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; \
--- a/src/testdir/test1.in +++ b/src/testdir/test1.in @@ -18,6 +18,10 @@ Similar logic is applied to the +mzschem 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
--- a/src/testdir/test92.in +++ b/src/testdir/test92.in @@ -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