diff options
| author | Michael Dawson <michael_dawson@ca.ibm.com> | 2018-10-19 17:26:40 -0400 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2018-10-22 11:28:49 -0400 |
| commit | 9464e43c7bab8586e33032863f95a0f0a489c878 (patch) | |
| tree | 6c6d25fc9334e75d58f944567e6c9213c3fa8975 /Makefile | |
| parent | d2fcd1dd392ae3f32054f0343d750251b842a314 (diff) | |
| download | android-node-v8-9464e43c7bab8586e33032863f95a0f0a489c878.tar.gz android-node-v8-9464e43c7bab8586e33032863f95a0f0a489c878.tar.bz2 android-node-v8-9464e43c7bab8586e33032863f95a0f0a489c878.zip | |
build: fix coverage generation
Changes in command line options for nyc resulted in the
coverage target no longer working.
Pin the major version of nyc and update the options to
get it working again.
PR-URL: https://github.com/nodejs/node/pull/23769
Fixes: https://github.com/nodejs/node/issues/23690
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: George Adams <george.adams@uk.ibm.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -203,7 +203,7 @@ coverage: coverage-test ## Run the tests and generate a coverage report. coverage-build: all mkdir -p node_modules if [ ! -d node_modules/nyc ]; then \ - $(NODE) ./deps/npm install nyc --no-save --no-package-lock; fi + $(NODE) ./deps/npm install nyc@13 --no-save --no-package-lock; fi if [ ! -d gcovr ]; then git clone -b 3.4 --depth=1 \ --single-branch git://github.com/gcovr/gcovr.git; fi if [ ! -d build ]; then git clone --depth=1 \ @@ -234,8 +234,9 @@ coverage-test: coverage-build $(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 "$(CURDIR)/coverage") + --temp-dir "$(CURDIR)/.cov_tmp" \ + --report-dir "$(CURDIR)/coverage" \ + --reporter html) -(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \ --gcov-exclude='.*usr' -v -r Release/obj.target \ --html --html-detail -o ../coverage/cxxcoverage.html \ |