Mercurial > vim

comparison src/testdir/Make_dos.mak @ 7645:1529ae1c456a v7.4.1122

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/42c9cfa7f4d2f176234e385573ff2fb1f61915e5 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 17 18:49:57 2016 +0100 patch 7.4.1122 Problem: Test 92 and 93 fail when using gvim on a system with a non utf-8 locale. Solution: Avoid using .gvimrc by adding -U NONE. (Yukihiro Nakadaira)
author Christian Brabandt <cb@256bit.org>
date Sun, 17 Jan 2016 19:00:04 +0100
parents ad3e9ea845e7
children 1b6a589a0efc
comparison
equal deleted inserted replaced
7644:db5cd097d9d7 7645:1529ae1c456a
36 36
37 # Copy the input files to dostmp, changing the fileformat to dos. 37 # Copy the input files to dostmp, changing the fileformat to dos.
38 $(DOSTMP_INFILES): $(*B).in 38 $(DOSTMP_INFILES): $(*B).in
39 if not exist $(DOSTMP)\NUL md $(DOSTMP) 39 if not exist $(DOSTMP)\NUL md $(DOSTMP)
40 if exist $@ del $@ 40 if exist $@ del $@
41 $(VIMPROG) -u dos.vim --noplugin "+set ff=dos|f $@|wq" $(*B).in 41 $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=dos|f $@|wq" $(*B).in
42 42
43 # For each input file dostmp/test99.in run the tests. 43 # For each input file dostmp/test99.in run the tests.
44 # This moves test99.in to test99.in.bak temporarily. 44 # This moves test99.in to test99.in.bak temporarily.
45 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in 45 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
46 -@if exist test.out DEL test.out 46 -@if exist test.out DEL test.out
53 -@if exist test.ok del test.ok 53 -@if exist test.ok del test.ok
54 -@if exist Xdir1 rd /s /q Xdir1 54 -@if exist Xdir1 rd /s /q Xdir1
55 -@if exist Xfind rd /s /q Xfind 55 -@if exist Xfind rd /s /q Xfind
56 -@del X* 56 -@del X*
57 -@if exist viminfo del viminfo 57 -@if exist viminfo del viminfo
58 $(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \ 58 $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=unix|f test.out|wq" \
59 $(DOSTMP)\$(*B).out 59 $(DOSTMP)\$(*B).out
60 @diff test.out $*.ok & if errorlevel 1 \ 60 @diff test.out $*.ok & if errorlevel 1 \
61 ( move /y test.out $*.failed \ 61 ( move /y test.out $*.failed \
62 & del $(DOSTMP)\$(*B).out \ 62 & del $(DOSTMP)\$(*B).out \
63 & echo $* FAILED >> test.log ) \ 63 & echo $* FAILED >> test.log ) \
112 # Limitation: Only works with the +eval feature. 112 # Limitation: Only works with the +eval feature.
113 113
114 newtests: $(NEW_TESTS) 114 newtests: $(NEW_TESTS)
115 115
116 .vim.res: 116 .vim.res:
117 $(VIMPROG) -u NONE -S runtest.vim $*.vim 117 $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim