diff options
| author | erw7 <erw7.github@gmail.com> | 2019-08-05 13:27:13 +0900 |
|---|---|---|
| committer | erw7 <erw7.github@gmail.com> | 2019-08-17 12:29:09 +0900 |
| commit | 619f1360752ad121426b5b352a05d28f8069b590 (patch) | |
| tree | bf760474844c3faa461182f20c3e6041e282b397 | |
| parent | 505d5fb960e1af7c78e7e589c729523c7da1c544 (diff) | |
| download | rneovim-619f1360752ad121426b5b352a05d28f8069b590.tar.gz rneovim-619f1360752ad121426b5b352a05d28f8069b590.tar.bz2 rneovim-619f1360752ad121426b5b352a05d28f8069b590.zip | |
Add target fixff to testdir/Makefile
In Windows, since conversion of the line feed code is necessary, porting
fixff target from Make_mingw.mak of vim.
| -rw-r--r-- | src/nvim/testdir/Makefile | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 8b43d91e25..4b0db49bad 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -25,6 +25,12 @@ ifneq ($(OS),Windows_NT) endif +ifeq ($(OS),Windows_NT) + FIXFF = fixff +else + FIXFF = +endif + SCRIPTS ?= $(SCRIPTS_DEFAULT) # Tests using runtest.vim. @@ -74,7 +80,7 @@ ifdef TESTNUM SCRIPTS := test$(TESTNUM).out endif -nongui: nolog $(SCRIPTS) newtests report +nongui: nolog $(FIXFF) $(SCRIPTS) newtests report .gdbinit: @echo "[OLDTEST-PREP] Setting up .gdbinit" @@ -95,6 +101,16 @@ test1.out: $(NVIM_PRG) $(SCRIPTS): $(NVIM_PRG) test1.out +NO_PLUGINS = --noplugin --headless +NO_INITS = -U NONE $(NO_PLUGINS) + +# TODO: find a way to avoid changing the distributed files. +fixff: + -$(NVIM_PRG) -u unix.vim $(NO_INITS) "+argdo set ff=dos|upd" +q \ + *.in *.ok + -$(NVIM_PRG) -u unix.vim $(NO_INITS) "+argdo set ff=dos|upd" +q \ + dotest.in + RM_ON_RUN := test.out X* viminfo RM_ON_START := test.ok RUN_VIM := $(TOOL) $(NVIM_PRG) -u unix.vim -U NONE -i viminfo --headless --noplugin -s dotest.in |