@@ -16,11 +16,16 @@ 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 lcov;
-      export CXX='g++-4.8';
-      export GYP_DEFINES='coverage=1';
+      sudo apt-get -qq install gcc-4.8 g++-4.8 lcov;
+      sudo rm /usr/bin/gcov /usr/bin/g++;
+      sudo ln -s /usr/bin/gcov-4.8 /usr/bin/gcov;
+      sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++;
+      export CC="gcc-4.8";
+      export CXX="g++-4.8";
+      export GYP_DEFINES="coverage=1";
+      export JOBS=4;
+      sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
     fi
-  - "export JOBS=4"
   - BUILD_ONLY=true npm install
 # This is a random private key used purely for testing.
 before_script:
@@ -41,7 +46,12 @@ branches:
 os:
   - linux
   - osx
-script: npm test
+script:
+  - if [ $TRAVIS_OS_NAME == "linux" ] && [ $NODE_VERSION == "0.12" ]; then
+      npm test && npm run cov && npm run coveralls;
+    else
+      npm test;
+    fi
 notifications:
   slack:
     secure: KglNSqZiid9YudCwkPFDh+sZfW5BwFlM70y67E4peHwwlbbV1sSBPHcs74ZHP/lqgEZ4hMv4N2NI58oYFD5/1a+tKIQP1TkdIMuq4j2LXheuirA2HDcydOVrsC8kRx5XFGKdVRg/uyX2dlRHcOWFhxrS6yc6IxtxYWlRTD2SmEc=
 
@@ -9,6 +9,7 @@ NodeGit
       <th>Linux</th>
       <th>OS X</th>
       <th>Windows</th>
+      <th>Coverage</th>
       <th>Dependencies</th>
     </tr>
   </thead>
@@ -20,6 +21,9 @@ NodeGit
       <td align="center">
         <a href="https://ci.appveyor.com/project/timbranyen/nodegit"><img src="https://ci.appveyor.com/api/projects/status/e5a5q75l9yfhnfv2?svg=true"></a>
       </td>
+      <td align="center">
+        <a href="https://coveralls.io/r/nodegit/nodegit"><img src="https://coveralls.io/repos/nodegit/nodegit/badge.svg" alt="Coverage Status"></a>
+      </td>
       <td align="center">
         <a href="https://david-dm.org/nodegit/nodegit"><img src="https://david-dm.org/nodegit/nodegit.svg"></a>
       </td>
 
@@ -9,6 +9,10 @@
         "<(module_root_dir)/vendor/libgit2.gyp:libgit2"
       ],
 
+      "variables": {
+        "coverage%": 0
+      },
+
       "sources": [
         "src/nodegit.cc",
         "src/wrapper.cc",
@@ -32,6 +36,19 @@
       ],
 
       "conditions": [
+        [
+          "coverage==1", {
+            "cflags": [
+              "-ftest-coverage",
+              "-fprofile-arcs"
+            ],
+            "link_settings": {
+              "libraries": [
+                "-lgcov"
+              ]
+            },
+          }
+        ],
         [
           "OS=='mac'", {
             "xcode_settings": {
 
@@ -86,7 +86,8 @@ function build() {
 
   var opts = {
     cwd: ".",
-    maxBuffer: Number.MAX_VALUE
+    maxBuffer: Number.MAX_VALUE,
+    env: process.env
   };
 
   var prefix = "";
 
@@ -63,6 +63,7 @@
   },
   "devDependencies": {
     "combyne": "^0.6.5",
+    "coveralls": "^2.11.2",
     "istanbul": "^0.3.5",
     "js-beautify": "^1.5.4",
     "jshint": "^2.6.0",
@@ -82,6 +83,7 @@
   },
   "scripts": {
     "lint": "jshint lib test/tests examples lifecycleScripts",
+    "coveralls": "cat ./test/coverage/merged.lcov | coveralls",
     "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",
 
@@ -2,7 +2,7 @@ var fork = require("child_process").fork;
 var path = require("path");
 
 var bin = "./node_modules/.bin/istanbul";
-var cov = "cover --report=lcov _mocha --".split(" ");
+var cov = "cover --report=lcov --dir=test/coverage/js _mocha --".split(" ");
 
 if (process.platform === 'win32') {
   bin = "./node_modules/mocha/bin/mocha";