diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-12 00:44:25 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-12 00:44:25 +0300 |
| commit | 1f9dd689b9f2b68edbc40cc3c60d46db853dda94 (patch) | |
| tree | 1da60fa8fcc4fb8e2a578fac90edae3eb5618202 /src/nvim/testdir | |
| parent | 9f534422e6c3649ee40904ae3606455d26b48188 (diff) | |
| parent | 8813b29cec13f7410427fbb8913d3753dd6626a7 (diff) | |
| download | rneovim-1f9dd689b9f2b68edbc40cc3c60d46db853dda94.tar.gz rneovim-1f9dd689b9f2b68edbc40cc3c60d46db853dda94.tar.bz2 rneovim-1f9dd689b9f2b68edbc40cc3c60d46db853dda94.zip | |
Merge branch 'master' into hide-container-impl
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/Makefile | 20 | ||||
| -rw-r--r-- | src/nvim/testdir/unix.vim | 6 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 111bd172ef..e1faaccb84 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -2,7 +2,11 @@ # Makefile to run all tests for Vim # -NVIM_PRG ?= ../../../build/bin/nvim +ifeq ($(OS),Windows_NT) + NVIM_PRG ?= ../../../build/bin/nvim.exe +else + NVIM_PRG ?= ../../../build/bin/nvim +endif TMPDIR ?= Xtest-tmpdir SCRIPTSOURCE := ../../../runtime @@ -10,12 +14,9 @@ export SHELL := sh export NVIM_PRG := $(NVIM_PRG) export TMPDIR -SCRIPTS ?= \ - test13.out \ +SCRIPTS_DEFAULT = \ test14.out \ - test17.out \ test24.out \ - test32.out \ test37.out \ test40.out \ test42.out \ @@ -27,6 +28,15 @@ SCRIPTS ?= \ test73.out \ test79.out \ +ifneq ($(OS),Windows_NT) + SCRIPTS_DEFAULTS := $(SCRIPTS_DEFAULT) \ + test17.out \ + test32.out \ + +endif + +SCRIPTS ?= $(SCRIPTS_DEFAULT) + # Tests using runtest.vim. # Keep test_alot*.res as the last one, sort the others. NEW_TESTS ?= \ diff --git a/src/nvim/testdir/unix.vim b/src/nvim/testdir/unix.vim index a7daacf8cf..ce2beff7fe 100644 --- a/src/nvim/testdir/unix.vim +++ b/src/nvim/testdir/unix.vim @@ -2,6 +2,12 @@ " Always use "sh", don't use the value of "$SHELL". set shell=sh +if has('win32') + set shellcmdflag=-c shellxquote= shellxescape= shellquote= + let &shellredir = '>%s 2>&1' + set shellslash +endif + " Don't depend on system locale, always use utf-8 set encoding=utf-8 |