From effbe5c6106db7cc2f82aabfb5027b78d7763bb0 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 19 Oct 2018 17:26:40 -0400 Subject: [PATCH] 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 Reviewed-By: Refael Ackermann Reviewed-By: Joyee Cheung Reviewed-By: George Adams --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a98772faea6dca..eeb65c38e05eb6 100644 --- a/Makefile +++ b/Makefile @@ -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 \