Skip to content

Commit c066246

Browse files
committed
patch 7.4.1000
Problem: Test 49 is slow and doesn't work on MS-Windows. Solution: Start moving parts of test 49 to test_viml.
1 parent b8cb643 commit c066246

File tree

5 files changed

+22
-356
lines changed

5 files changed

+22
-356
lines changed

src/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,12 +1976,19 @@ test_assert \
19761976
test_searchpos \
19771977
test_sort \
19781978
test_undolevels \
1979+
test_viml \
19791980
test_alot:
19801981
cd testdir; rm -f [email protected] test.log messages; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
1982+
@if test -f testdir/test.log; then \
1983+
cat testdir/test.log; \
1984+
fi
19811985
cat testdir/messages
19821986

19831987
newtests:
19841988
cd testdir; rm -f $@.res test.log messages; $(MAKE) -f Makefile newtests VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
1989+
@if test -f testdir/test.log; then \
1990+
cat testdir/test.log; \
1991+
fi
19851992
cat testdir/messages
19861993

19871994
testclean:

src/testdir/runtest.vim

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ if &lines < 24 || &columns < 80
3333
cquit
3434
endif
3535

36+
" For consistency run all tests with 'nocompatible' set.
37+
" This also enables use of line continuation.
38+
set nocp viminfo+=nviminfo
39+
40+
" Avoid stopping at the "hit enter" prompt
41+
set nomore
42+
43+
" Output all messages in English.
44+
lang mess C
45+
3646
" Source the test script. First grab the file name, in case the script
3747
" navigates away.
3848
let testname = expand('%')

src/testdir/test49.ok

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
Results of test49.vim:
2-
*** Test 1: OK (34695)
3-
*** Test 2: OK (34695)
4-
*** Test 3: OK (1384648195)
5-
*** Test 4: OK (32883)
6-
*** Test 5: OK (32883)
7-
*** Test 6: OK (603978947)
82
*** Test 7: OK (90563)
93
*** Test 8: OK (562493431)
104
*** Test 9: OK (363)

0 commit comments

Comments
 (0)