Adds in C++ code coverage and joined JS

tbranyen · tbranyen · commit c1fe4f4acb43 · 2015-03-21T21:38:24.000-04:00
This commit adds in CPP code coverage via GCC and GCOV.  That lcov data
is then joined to the JavaScript istanbul output and then generated into
unified test/coverage/report and test/merged.cov reports.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,9 @@ before_install:
   - if [ $TRAVIS_OS_NAME == "linux" ]; then
       sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
       sudo apt-get -qq update;
-      sudo apt-get -qq install g++-4.8;
+      sudo apt-get -qq install g++-4.8 lcov;
       export CXX='g++-4.8';
+      export GYP_DEFINES='coverage=1';
     fi
   - "export JOBS=4"
   - BUILD_ONLY=true npm install
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "istanbul": "^0.3.5",
     "js-beautify": "^1.5.4",
     "jshint": "^2.6.0",
+    "lcov-result-merger": "^1.0.2",
     "lodash": "^3.1.0",
     "mocha": "~2.1.0",
     "nan": "^1.7.0",
@@ -81,10 +82,12 @@
   },
   "scripts": {
     "lint": "jshint lib test/tests examples lifecycleScripts",
-    "cov": "node --expose-gc test",
+    "cppcov": "mkdir -p test/coverage/cpp && lcov --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov.info",
+    "mergecov": "lcov-result-merger 'test/**/*.info' 'test/coverage/merged.lcov' && genhtml test/coverage/merged.lcov --output-directory test/coverage/report",
+    "cov": "npm run cppcov && npm run mergecov",
     "mocha": "mocha test/runner test/tests",
     "mochaDebug": "mocha --debug-brk test/runner test/tests",
-    "test": "npm run lint && npm run cov",
+    "test": "npm run lint && node --expose-gc test",
     "generateJson": "node generate/scripts/generateJson",
     "generateNativeCode": "node generate/scripts/generateNativeCode",
     "generateMissingTests": "node generate/scripts/generateMissingTests",
diff --git a/test/index.js b/test/index.js
@@ -1,20 +1,18 @@
 var fork = require("child_process").fork;
 var path = require("path");
 
-var args = [
-  "cover",
-  process.platform != "win32" ?
-    "_mocha" :
-    "../node_modules/mocha/bin/_mocha",
-  "--",
-  "runner",
-  "tests",
-  "--report=lcov",
+var bin = "./node_modules/.bin/istanbul";
+var cov = "cover --report=lcov _mocha --".split(" ");
+
+if (process.platform === 'win32') {
+  bin = "./node_modules/mocha/bin/mocha";
+  cov = [];
+}
+
+var args = cov.concat([
+  "test/runner",
+  "test/tests",
   "--expose-gc"
-];
+]);
 
-fork("../node_modules/istanbul/lib/cli.js", args, {
-  cwd: __dirname
-}).on("close", function(code) {
-  process.exit(code);
-});
+fork(bin, args, { cwd: path.join(__dirname, "../") }).on("close", process.exit);
