Combine 'py27' and 'test' runs.

.travis.yml

@@ -14,9 +14,9 @@ addons:
       - mopidy
 
 env:
-  - TOX_ENV=py27
+  # Need to run 'py27' and 'test' together so that we can share coverage reports.
+  - TOX_ENV=py27,test
   - TOX_ENV=flake8
-  - TOX_ENV=test
   - TOX_ENV=eslint
   - TOX_ENV=csslint
   - TOX_ENV=tidy
@@ -28,9 +28,15 @@ before_install:
 
 install:
   - "pip install tox"
+  - "gem install coveralls-lcov"
+
+before_script:
+  - "./autogen.sh"
+  - "./configure --enable-coverage"
 
 script:
+  - "make check"
   - "tox -e $TOX_ENV"
 
 after_success:
-  - "if [ $TOX_ENV == 'test' ]; then pip install coveralls; coveralls --merge=.karma_coverage/coverage-final.json; fi"
+  - "if [ $TOX_ENV == 'py27,test' ]; then coveralls-lcov -v -n .karma_coverage/lcov.info > .karma_coverage/lcov.json; pip install coveralls; coveralls --merge=.karma_coverage/lcov.json; fi"

karma.conf.js

@@ -74,7 +74,6 @@ module.exports = function (config) {
             dir: '.karma_coverage/',
             reporters: [
                 { type: 'lcov', subdir: '.' },
-                { type: 'json', subdir: '.' },
                 { type: 'text' }
             ]
         }

tox.ini

@@ -2,6 +2,7 @@
 envlist = py27, flake8, test, eslint, csslint, tidy
 
 [testenv]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 sitepackages = true
 whitelist_externals =
     py.test
@@ -31,7 +32,6 @@ skip_install = true
 commands = flake8 --show-source --statistics --max-line-length 120 {posargs:mopidy_musicbox_webclient tests}
 
 [testenv:test]
-envdir = py27
 sitepackages = false
 whitelist_externals =
     /bin/bash