不要怂,就是干,撸起袖子干!

Commit 921e3412 by Jan Aagaard Meier

Playing around with coveralls

1 parent 56bbf926
Showing with 19 additions and 10 deletions
...@@ -37,9 +37,17 @@ matrix: ...@@ -37,9 +37,17 @@ matrix:
fast_finish: true fast_finish: true
include: include:
- node_js: "0.11" - node_js: "0.8"
env: DB=mysql DIALECT=mysql env: COVERAGE=true DB=mysql DIALECT=mysql
- node_js: "0.8"
env: COVERAGE=true DB=mysql DIALECT=postgres
- node_js: "0.8"
env: COVERAGE=true DB=mysql DIALECT=sqlite
allow_failures: allow_failures:
- node_js: "0.11" - node_js: "0.8"
env: DB=mysql DIALECT=mysql env: COVERAGE=true DB=mysql DIALECT=mysql
\ No newline at end of file - node_js: "0.8"
env: COVERAGE=true DB=mysql DIALECT=postgres
- node_js: "0.8"
env: COVERAGE=true DB=mysql DIALECT=sqlite
\ No newline at end of file
...@@ -12,7 +12,9 @@ teaser: ...@@ -12,7 +12,9 @@ teaser:
echo '' echo ''
test: test:
@if [ "$$GREP" ]; then \ @if [ -n "$$COVERAGE" ]; then \
make cover && make coveralls-send; \
@elif [ "$$GREP" ]; \ then \
make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \ make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
else \ else \
make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) $(TESTS); \ make teaser && ./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --check-leaks --colors -t 10000 --reporter $(REPORTER) $(TESTS); \
...@@ -20,8 +22,7 @@ test: ...@@ -20,8 +22,7 @@ test:
cover: cover:
rm -rf coverage \ rm -rf coverage \
make teaser && ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- -- -u exports --report lcovonly -- -R spec -- $(TESTS); \ make teaser && ./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly -- -R spec $(TESTS); \
mv coverage coverage-$(DIALECT) \
mariadb: mariadb:
@DIALECT=mariadb make test @DIALECT=mariadb make test
......
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
"mariasql": "0.1.20", "mariasql": "0.1.20",
"chai-spies": "~0.5.1", "chai-spies": "~0.5.1",
"lcov-result-merger": "0.0.2", "lcov-result-merger": "0.0.2",
"istanbul": "~0.1.45", "istanbul": "~0.2.9",
"coveralls": "~2.7.1", "coveralls": "~2.10.0",
"async": "~0.2.10", "async": "~0.2.10",
"coffee-script": "~1.7.1", "coffee-script": "~1.7.1",
"markdox": "0.1.4", "markdox": "0.1.4",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!