From e3114dc3001fb01ecb850fbe58070dadec6d1270 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 8 Aug 2016 23:57:59 +0200 Subject: [PATCH 1/4] Update outdated gcovr patch --- gcovr-patches.diff | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gcovr-patches.diff b/gcovr-patches.diff index 113948f..c31c22b 100644 --- a/gcovr-patches.diff +++ b/gcovr-patches.diff @@ -21,11 +21,3 @@ index 034779c86d29..e68b239c424f 100755 if options.root is not None: if not options.root: sys.stderr.write( -@@ -2155,6 +2158,7 @@ if options.root is not None: - else: - root_dir = starting_dir - options.root_filter = re.compile(re.escape(root_dir + os.sep)) -+ starting_dir = root_dir - - for i in range(0, len(options.filter)): - options.filter[i] = re.compile(options.filter[i]) From 4647313c567140980d075ba43e7b26fce71116ac Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 9 Aug 2016 21:05:54 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Migrate=20from=20`istanbul`=20to=20`nyc`=20?= =?UTF-8?q?=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Better ES6 support, because that seems to be necessary now. --- coverage.sh | 17 +++++++++-------- package.json | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/coverage.sh b/coverage.sh index fe38a4b..a95ac0c 100755 --- a/coverage.sh +++ b/coverage.sh @@ -38,7 +38,7 @@ export PATH="$(pwd):$PATH" # if we don't have our npm dependencies available, build node and fetch them # with npm -if [ ! -x "$SRCDIR/node_modules/.bin/istanbul" ] || \ +if [ ! -x "$SRCDIR/node_modules/.bin/nyc" ] || \ [ ! -x "$SRCDIR/node_modules/.bin/istanbul-merge" ]; then echo "Building, without lib/ coverage..." >&2 ./configure @@ -47,17 +47,17 @@ if [ ! -x "$SRCDIR/node_modules/.bin/istanbul" ] || \ cd "$SRCDIR" - # get istanbul - node "$WORKDIR/node/deps/npm" install + # get nyc + istanbul-merge + ./node "$WORKDIR/node/deps/npm" install - test -x "$SRCDIR/node_modules/.bin/istanbul" + test -x "$SRCDIR/node_modules/.bin/nyc" test -x "$SRCDIR/node_modules/.bin/istanbul-merge" fi cd "$WORKDIR/node" echo "Instrumenting code in lib/..." >&2 -"$SRCDIR/node_modules/.bin/istanbul" instrument lib/ -o lib_/ +"$SRCDIR/node_modules/.bin/nyc" instrument lib/ lib_/ sed -e s~"'"lib/~"'"lib_/~g -i~ node.gyp echo "Removing old coverage files" >&2 @@ -77,10 +77,11 @@ python tools/test.py --mode=release -J \ addons doctool known_issues pseudo-tty parallel sequential echo "Gathering coverage..." >&2 -mkdir -p coverage -"$SRCDIR/node_modules/.bin/istanbul-merge" --out coverage/libcov.json \ +mkdir -p coverage .cov_tmp +"$SRCDIR/node_modules/.bin/istanbul-merge" --out .cov_tmp/libcov.json \ 'out/Release/.coverage/coverage-*.json' -"$SRCDIR/node_modules/.bin/istanbul" report --include coverage/libcov.json html +(cd lib && "$SRCDIR/node_modules/.bin/nyc" report \ + --temp-directory "$(pwd)/../.cov_tmp" -r html --report-dir "../coverage") (cd out && "$WORKDIR/gcovr/scripts/gcovr" --gcov-exclude='.*deps' --gcov-exclude='.*usr' -v \ -r Release/obj.target/node --html --html-detail \ -o ../coverage/cxxcoverage.html) diff --git a/package.json b/package.json index 8f9876a..8ed1669 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "url": "https://github.com/addaleax/node-core-coverage/issues" }, "dependencies": { - "istanbul": "^0.4.3", - "istanbul-merge": "^1.1.0" + "istanbul-merge": "^1.1.0", + "nyc": "^7.1.0" }, "homepage": "https://github.com/addaleax/node-core-coverage#readme", "license": "MIT", From f3cf5d31dceec41def030df2a125109ed8fc6b44 Mon Sep 17 00:00:00 2001 From: CurryKitten Date: Tue, 9 Aug 2016 21:08:38 +0200 Subject: [PATCH 3/4] Fix CXXCOVERAGE for current gcovr version Fixes: https://github.com/addaleax/node-core-coverage/issues/19 --- coverage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coverage.sh b/coverage.sh index a95ac0c..22236ae 100755 --- a/coverage.sh +++ b/coverage.sh @@ -95,7 +95,7 @@ cp -rv coverage "$OUTDIR/coverage-$COMMIT_ID" JSCOVERAGE=$(grep -B1 Lines coverage/index.html | \ head -n1 | grep -o '[0-9\.]*') CXXCOVERAGE=$(grep -A3 Lines coverage/cxxcoverage.html | \ - grep style|grep -o '[0-9\.]*') + grep style | grep -o '[0-9]\{1,3\}\.[0-9]\{1,2\}') echo "JS Coverage: $JSCOVERAGE %" echo "C++ Coverage: $CXXCOVERAGE %" From 8970451458371e37093d1498660abd8885c2c149 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 12 Aug 2016 20:23:33 +0200 Subject: [PATCH 4/4] Bump to de-facto required nyc version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ed1669..b9924e7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "istanbul-merge": "^1.1.0", - "nyc": "^7.1.0" + "nyc": "^8.0.0-candidate" }, "homepage": "https://github.com/addaleax/node-core-coverage#readme", "license": "MIT",