Mercurial > vim
changeset 7645:1529ae1c456a v7.4.1122
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 | db5cd097d9d7 |
children | a9a6001dc181 |
files | src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Make_vms.mms src/testdir/Makefile src/version.c |
diffstat | 5 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -38,7 +38,7 @@ win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(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 @@ win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) -@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
--- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -65,8 +65,8 @@ win32: fixff $(SCRIPTS_FIRST) $(SCRIPTS) echo ALL DONE fixff: - -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok - -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ + -$(VIMPROG) -u dos.vim -U NONE --noplugin "+argdo set ff=dos|upd" +q *.in *.ok + -$(VIMPROG) -u dos.vim -U NONE --noplugin "+argdo set ff=unix|upd" +q \ dotest.in test60.ok test71.ok test74.ok test_listchars.ok clean:
--- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -163,7 +163,7 @@ SCRIPT_PYTHON = test86.out test87.out -@ write sys$output " "$*" " -@ write sys$output "-----------------------------------------------" -@ !run the test - -@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in + -@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim -U NONE --noplugin -s dotest.in $*.in -@ !analyse the result -@ directory /size/date test.out -@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out