Skip to content

Commit e13cb46

Browse files
authored
Merge pull request #143 from vim-jp/add-test-tasks
Makefile: add 'test-fast', change 'test' to 'vim/test' and make 'test'
2 parents 0fb74a0 + 82aefeb commit e13cb46

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ jobs:
88
- name: Vim 7.4
99
env:
1010
- VIM_VERSION=v7.4
11-
- MAKE_TARGET=test
11+
- MAKE_TARGET=vim/test
1212
- TEST_PROFILE=vim-profile-v7.4.txt
1313
- name: Vim v8
1414
env:
1515
- VIM_VERSION=v8.0.0000
16-
- MAKE_TARGET=test
16+
- MAKE_TARGET=vim/test
1717
- TEST_PROFILE=vim-profile-v8.0.txt
1818
- name: Vim master
1919
env:
2020
- VIM_VERSION=master
21-
- MAKE_TARGET=test
21+
- MAKE_TARGET=vim/test
2222
- TEST_PROFILE=vim-profile-master.txt
2323
- name: Installed Vim with checks
2424
env:
2525
- VIM_VERSION=installed
26-
- MAKE_TARGET="clean_compiled check checkpy checkvim js/test py/test test/node_position/test_position.out"
26+
- MAKE_TARGET=test
2727
- TEST_PROFILE=vim-profile-installed.txt
2828
- TEST_PYTHON=python3
2929

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ COMPILED_FILES:=js/vimlparser.js py/vimlparser.py
22

33
all: $(COMPILED_FILES)
44

5+
test: clean_compiled check fast-test
6+
fast-test: checkpy checkvim vim/test js/test py/test test/node_position/test_position.out
7+
58
js/vimlparser.js: autoload/vimlparser.vim js/jscompiler.vim js/vimlfunc.js
69
scripts/jscompile.sh $< $@
710

@@ -22,7 +25,7 @@ checkpy: all
2225
checkvim: all
2326
vint autoload py/pycompiler.vim
2427

25-
test:
28+
vim/test:
2629
test/run.sh
2730

2831
js/test: js/vimlparser.js
@@ -36,4 +39,4 @@ test/node_position/test_position.out: test/node_position/test_position.vim test/
3639
vim -Nu test/vimrc -S test/node_position/test_position.vim
3740
diff -u test/node_position/test_position.ok test/node_position/test_position.out
3841

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

0 commit comments

Comments
 (0)