diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-17 18:49:57 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-17 18:49:57 +0100 |
commit | 42c9cfa7f4d2f176234e385573ff2fb1f61915e5 (patch) | |
tree | a5376a7fe453db6a983cbb80fb432ae86fc71e8b /src/testdir/Make_dos.mak | |
parent | 08b270a8a4544be9a7fecce311834fde2b457634 (diff) |
patch 7.4.1122v7.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)
Diffstat (limited to 'src/testdir/Make_dos.mak')
-rw-r--r-- | src/testdir/Make_dos.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 480993087a..3073e9eb5c 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -38,7 +38,7 @@ win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report $(DOSTMP_INFILES): $(*B).in if not exist $(DOSTMP)\NUL md $(DOSTMP) if exist $@ del $@ - $(VIMPROG) -u dos.vim --noplugin "+set ff=dos|f $@|wq" $(*B).in + $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=dos|f $@|wq" $(*B).in # For each input file dostmp/test99.in run the tests. # This moves test99.in to test99.in.bak temporarily. @@ -55,7 +55,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in -@if exist Xfind rd /s /q Xfind -@del X* -@if exist viminfo del viminfo - $(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \ + $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=unix|f test.out|wq" \ $(DOSTMP)\$(*B).out @diff test.out $*.ok & if errorlevel 1 \ ( move /y test.out $*.failed \ @@ -114,4 +114,4 @@ bench_re_freeze.out: bench_re_freeze.vim newtests: $(NEW_TESTS) .vim.res: - $(VIMPROG) -u NONE -S runtest.vim $*.vim + $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim |