Add io.js support to .travis.yml
This commit is contained in:
parent
5b7587bb7e
commit
70c1905f59
2 changed files with 17 additions and 7 deletions
|
@ -1,5 +1,6 @@
|
||||||
language: node_js
|
language: node_js
|
||||||
node_js:
|
node_js:
|
||||||
- "0.11"
|
- "0.11"
|
||||||
|
- iojs
|
||||||
script: "make test-travis"
|
script: "make test-travis"
|
||||||
after_script: "npm install coveralls@2.10.0 && cat ./coverage/lcov.info | coveralls"
|
after_script: "npm install coveralls@2.10.0 && cat ./coverage/lcov.info | coveralls"
|
||||||
|
|
23
Makefile
23
Makefile
|
@ -1,23 +1,32 @@
|
||||||
|
|
||||||
SRC = lib/*.js
|
SRC = lib/*.js
|
||||||
|
|
||||||
include node_modules/make-lint/index.mk
|
include node_modules/make-lint/index.mk
|
||||||
|
|
||||||
|
BIN = iojs
|
||||||
|
|
||||||
|
ifeq ($(findstring io.js, $(shell which node)),)
|
||||||
|
BIN = node
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq (node, $(BIN))
|
||||||
|
FLAGS = --harmony-generators
|
||||||
|
endif
|
||||||
|
|
||||||
TESTS = test/application \
|
TESTS = test/application \
|
||||||
test/context/* \
|
test/context/* \
|
||||||
test/request/* \
|
test/request/* \
|
||||||
test/response/*
|
test/response/*
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@NODE_ENV=test ./node_modules/.bin/mocha \
|
@NODE_ENV=test $(BIN) $(FLAGS) \
|
||||||
|
./node_modules/.bin/_mocha \
|
||||||
--require should \
|
--require should \
|
||||||
--harmony-generators \
|
|
||||||
$(TESTS) \
|
$(TESTS) \
|
||||||
--bail
|
--bail
|
||||||
|
|
||||||
test-cov:
|
test-cov:
|
||||||
@NODE_ENV=test node --harmony-generators \
|
@NODE_ENV=test $(BIN) $(FLAGS) \
|
||||||
node_modules/.bin/istanbul cover \
|
./node_modules/.bin/istanbul cover \
|
||||||
./node_modules/.bin/_mocha \
|
./node_modules/.bin/_mocha \
|
||||||
-- -u exports \
|
-- -u exports \
|
||||||
--require should \
|
--require should \
|
||||||
|
@ -25,8 +34,8 @@ test-cov:
|
||||||
--bail
|
--bail
|
||||||
|
|
||||||
test-travis:
|
test-travis:
|
||||||
@NODE_ENV=test node --harmony-generators \
|
@NODE_ENV=test $(BIN) $(FLAGS) \
|
||||||
node_modules/.bin/istanbul cover \
|
./node_modules/.bin/istanbul cover \
|
||||||
./node_modules/.bin/_mocha \
|
./node_modules/.bin/_mocha \
|
||||||
--report lcovonly \
|
--report lcovonly \
|
||||||
-- -u exports \
|
-- -u exports \
|
||||||
|
|
Loading…
Reference in a new issue