Skip to content

Makefile: add 'test-fast', change 'test' to 'vim/test' and make 'test' #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2019
Merged

Makefile: add 'test-fast', change 'test' to 'vim/test' and make 'test' #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cf09df
Makefile: add fast-test, vim/test
tyru Aug 7, 2019
82aefeb
fix missing command
tyru Aug 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ jobs:
- name: Vim 7.4
env:
- VIM_VERSION=v7.4
- MAKE_TARGET=test
- MAKE_TARGET=vim/test
- TEST_PROFILE=vim-profile-v7.4.txt
- name: Vim v8
env:
- VIM_VERSION=v8.0.0000
- MAKE_TARGET=test
- MAKE_TARGET=vim/test
- TEST_PROFILE=vim-profile-v8.0.txt
- name: Vim master
env:
- VIM_VERSION=master
- MAKE_TARGET=test
- MAKE_TARGET=vim/test
- TEST_PROFILE=vim-profile-master.txt
- name: Installed Vim with checks
env:
- VIM_VERSION=installed
- MAKE_TARGET="clean_compiled check checkpy checkvim js/test py/test test/node_position/test_position.out"
- MAKE_TARGET=test
- TEST_PROFILE=vim-profile-installed.txt
- TEST_PYTHON=python3

Expand Down
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ COMPILED_FILES:=js/vimlparser.js py/vimlparser.py

all: $(COMPILED_FILES)

test: clean_compiled check fast-test
fast-test: checkpy checkvim vim/test js/test py/test test/node_position/test_position.out

js/vimlparser.js: autoload/vimlparser.vim js/jscompiler.vim js/vimlfunc.js
scripts/jscompile.sh $< $@

Expand All @@ -22,7 +25,7 @@ checkpy: all
checkvim: all
vint autoload

test:
vim/test:
test/run.sh

js/test: js/vimlparser.js
Expand All @@ -36,4 +39,4 @@ test/node_position/test_position.out: test/node_position/test_position.vim test/
vim -Nu test/vimrc -S test/node_position/test_position.vim
diff -u test/node_position/test_position.ok test/node_position/test_position.out

.PHONY: all clean_compiled check test js/test py/test
.PHONY: all clean_compiled check test fast-test vim/test js/test py/test