diff options
| author | Benjamin Coe <ben@npmjs.com> | 2018-05-15 17:30:05 -0700 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2018-05-18 16:14:47 +0200 |
| commit | d5a117c73f8f3aea38983f9875ff520f961402c1 (patch) | |
| tree | cab213ae217163a9860f9be81666918bdb286ec1 /Makefile | |
| parent | 2c42999f7e0cfb4d79124add35e0b19b50100074 (diff) | |
| download | android-node-v8-d5a117c73f8f3aea38983f9875ff520f961402c1.tar.gz android-node-v8-d5a117c73f8f3aea38983f9875ff520f961402c1.tar.bz2 android-node-v8-d5a117c73f8f3aea38983f9875ff520f961402c1.zip | |
build: use nyc's merge command
a 'merge' command has recently been added to nyc, eliminating the need
for the istanbul-merge library.
PR-URL: https://github.com/nodejs/node/pull/20760
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -165,8 +165,6 @@ coverage: coverage-test ## Run the tests and generate a coverage report. .PHONY: coverage-build coverage-build: all mkdir -p node_modules - if [ ! -d node_modules/istanbul-merge ]; then \ - $(NODE) ./deps/npm install istanbul-merge --no-save --no-package-lock; fi if [ ! -d node_modules/nyc ]; then \ $(NODE) ./deps/npm install nyc --no-save --no-package-lock; fi if [ ! -d gcovr ]; then git clone -b 3.4 --depth=1 \ @@ -195,11 +193,11 @@ coverage-test: coverage-build mv lib lib__ mv lib_ lib mkdir -p coverage .cov_tmp - $(NODE) ./node_modules/.bin/istanbul-merge --out \ - .cov_tmp/libcov.json 'out/Release/.coverage/coverage-*.json' + $(NODE) ./node_modules/.bin/nyc merge 'out/Release/.coverage' \ + .cov_tmp/libcov.json (cd lib && .$(NODE) ../node_modules/.bin/nyc report \ --temp-directory "$(CURDIR)/.cov_tmp" \ - --report-dir "../coverage") + --report-dir "$(CURDIR)/coverage") -(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \ --gcov-exclude='.*usr' -v -r Release/obj.target \ --html --html-detail -o ../coverage/cxxcoverage.html \ |