Merge branch 'ci-fix' into next

Conflicts: .travis.yml
openxc · Aug 2, 2014 · e80ecce · e80ecce
2 parents da645c6 + 37e375e
commit e80ecce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,5 +10,5 @@ before_install:
     - script/bootstrap.sh
     - cd src
 after_success:
-    - make coverage
-    - coveralls-lcov src/build/tests/coverage.info
+    - PLATFORM=TESTING make coverage
+    - coveralls-lcov build/tests/coverage.info
diff --git a/script/bootstrap/devel.sh b/script/bootstrap/devel.sh
@@ -4,7 +4,7 @@ source $BOOTSTRAP_DIR/common.sh
 
 echo "Installing dependencies for running test suite..."
 
-if [ -z $CI ] && ! command -v lcov >/dev/null 2>&1; then
+if ! command -v lcov >/dev/null 2>&1; then
     if [ $OS == "cygwin" ]; then
         echo "Missing lcov - Cygwin doesn't have a packaged version of lcov, and it's only required to calculate test suite coverage. We'll skip it."
     elif [ $OS == "mac" ]; then