diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-18 13:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-18 13:31:28 +0200 |
| commit | d351f1c871ee9901db389e164789ea33d3e1871f (patch) | |
| tree | 5258690fd76a31d3befeb32ffae08f5b61eebfab /src/nvim/testdir/Makefile | |
| parent | c5efa9c352d63febd30764c04738f81e512b19f6 (diff) | |
| parent | 3453a2ccb07f7de4f0160b906a70a72ded89ca14 (diff) | |
| download | rneovim-d351f1c871ee9901db389e164789ea33d3e1871f.tar.gz rneovim-d351f1c871ee9901db389e164789ea33d3e1871f.tar.bz2 rneovim-d351f1c871ee9901db389e164789ea33d3e1871f.zip | |
Merge #10679 from erw7/fix-oldtest-on-windows
Diffstat (limited to 'src/nvim/testdir/Makefile')
| -rw-r--r-- | src/nvim/testdir/Makefile | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 8b43d91e25..b72f55730f 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -16,7 +16,6 @@ export TMPDIR := $(abspath ../../../Xtest-tmpdir) SCRIPTS_DEFAULT = \ test42.out \ test48.out \ - test52.out \ test64.out \ ifneq ($(OS),Windows_NT) @@ -25,6 +24,12 @@ ifneq ($(OS),Windows_NT) endif +ifeq ($(OS),Windows_NT) + FIXFF = fixff +else + FIXFF = +endif + SCRIPTS ?= $(SCRIPTS_DEFAULT) # Tests using runtest.vim. @@ -74,7 +79,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 +100,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 |