diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2017-12-08 10:42:30 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-12-10 02:45:41 +0100 |
| commit | 4a5bc6275d09056ff0ccf5a29a878d48bbe58655 (patch) | |
| tree | b39c815b0eb8dee50e2bc5198b751cb96b470821 | |
| parent | 3cc7ebf8107bddb42a566ede4c2a51818ff623c5 (diff) | |
| download | rneovim-4a5bc6275d09056ff0ccf5a29a878d48bbe58655.tar.gz rneovim-4a5bc6275d09056ff0ccf5a29a878d48bbe58655.tar.bz2 rneovim-4a5bc6275d09056ff0ccf5a29a878d48bbe58655.zip | |
ci: run oldtests in Appveyor #7705
| -rw-r--r-- | ci/build.bat | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 20 | ||||
| -rw-r--r-- | src/nvim/testdir/unix.vim | 6 |
3 files changed, 27 insertions, 5 deletions
diff --git a/ci/build.bat b/ci/build.bat index 91eca9ef73..25f949b5e4 100644 --- a/ci/build.bat +++ b/ci/build.bat @@ -53,6 +53,12 @@ bin\nvim --version || goto :error :: Functional tests mingw32-make functionaltest VERBOSE=1 || goto :error +:: Old tests +setlocal +set PATH=%PATH%;C:\msys64\usr\bin +mingw32-make -C "%~dp0\..\src\nvim\testdir" VERBOSE=1 +endlocal + if defined USE_GCOV ( C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) || echo 'codecov upload failed.'" ) 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 |