diff options
| author | Gregg Caines <[email protected]> | 2013-11-23 07:41:18 -0800 |
|---|---|---|
| committer | Gregg Caines <[email protected]> | 2013-11-23 07:41:18 -0800 |
| commit | 7c7ce93b06d8e2b08ea9107c44dc9d5de4d746ba (patch) | |
| tree | 5ee1c95856a9aae2b762a2ee35bee3d58f25117f /Makefile | |
| parent | b59caf0606d2ab612cedc62e39a27142b8d7e499 (diff) | |
| download | node-coveralls-7c7ce93b06d8e2b08ea9107c44dc9d5de4d746ba.tar.xz node-coveralls-7c7ce93b06d8e2b08ea9107c44dc9d5de4d746ba.zip | |
fixed merge conflicts in makefile. continuing work to switch coverage tool to istanbul.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -2,21 +2,19 @@ REPORTER = spec test: @$(MAKE) lint @echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID) - @$(MAKE) core_test - -core_test: - @NODE_ENV=test ./node_modules/.bin/mocha -b --require blanket --reporter $(REPORTER) + @NODE_ENV=test ./node_modules/.bin/mocha -b --reporter $(REPORTER) lint: ./node_modules/.bin/jshint ./lib ./test ./index.js test-cov: - $(MAKE) test REPORTER=spec - $(MAKE) core_test REPORTER=html-cov > coverage.html + $(MAKE) lint + @NODE_ENV=test ./node_modules/.bin/istanbul cover \ + ./node_modules/mocha/bin/_mocha -- -R spec test-coveralls: - $(MAKE) test REPORTER=spec - $(MAKE) core_test REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose - rm -rf lib-cov + @NODE_ENV=test ./node_modules/.bin/istanbul cover \ + ./node_modules/mocha/bin/_mocha -- \ + REPORTER=mocha-lcov-reporter | ./bin/coveralls.js --verbose .PHONY: test |