Merge pull request #175 from cchampet/dev_coveralls

valnoel · valnoel · commit 73bb10684904 · 2015-04-27T12:23:53.000+02:00
Use coveralls tool
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,8 @@
 env:
+  global:
+     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build
+     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install
+     - J='-j3'
   matrix:
     - DEPENDENCY_MODE=libav
     - DEPENDENCY_MODE=ffmpeg
@@ -18,19 +22,27 @@ before_script:
   - date -u
   - uname -a
 
-  - chmod +x tools/travis.linux.install.deps.sh
-  - chmod +x tools/travis.osx.install.deps.sh
-  
+  - cd ${TRAVIS_BUILD_DIR}
+
+  # install coverage tools used by gcc compiler
+  - if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.install.coverage.sh; fi
+
+  # install avtranscoder dependencies
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
 
 script:
   # Build
-  - mkdir build
-  - cd build
-  - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/dist
-  - make install
+  - mkdir -p ${AVTRANSCODER_BUILD}
+  - cd ${AVTRANSCODER_BUILD}
+  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_COVERAGE=True
+  - make $J install
+
   # Launch tests
-  - cd ..
-  - chmod +x tools/travis.python.nosetests.sh
-  - if [ "${TRAVIS_OS_NAME}" = "linux" && "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
+  - if [ "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
+
+after_success:
+  - cd ${TRAVIS_BUILD_DIR}
+
+  # generate coverage for coveralls
+  - if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,10 @@ else()
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
 endif()
 
+# CPP flag to create code coverage report
+if(AVTRANSCODER_COVERAGE)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
+endif()
 
 add_subdirectory(src)
 
diff --git a/INSTALL.md b/INSTALL.md
@@ -52,11 +52,18 @@ cmake .. -DCMAKE_BUILD_TYPE=Release/Debug
 http://brew.sh/
 
 ###### Install avTranscoder
+Last stable version:
 ```
 brew tap cbenhagen/video
 brew install avtranscoder
 ```
 
+From develop branch:
+```
+brew tap cbenhagen/video
+brew install avtranscoder --devel
+```
+
 ###### Use homebrew to install only dependencies
 ```
 brew deps avtranscoder
diff --git a/README.md b/README.md
@@ -4,6 +4,10 @@ C++ API for Libav / FFmpeg
 
 Based on Libav/FFmpeg libraries to support various video and audio formats, avTranscoder provides the high level API to re-wrap or transcode media easily.
 
+[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=master)](https://travis-ci.org/avTranscoder/avTranscoder)
+[![Coverage Status](https://coveralls.io/repos/avTranscoder/avTranscoder/badge.svg)](https://coveralls.io/r/avTranscoder/avTranscoder)
+<a href="https://scan.coverity.com/projects/2626"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/2626/badge.svg"/></a>
+
 #### What you need to know
 * C++ library
 * Java and Python bindings generated with SWIG
@@ -47,20 +51,6 @@ avProfileType=avProfileTypeAudio
 codec=codecName
 ```
 
-#### Continuous Integration
-
-###### Drone.io  
-[![Build Status](https://drone.io/github.com/avTranscoder/avTranscoder/status.png)](https://drone.io/github.com/avTranscoder/avTranscoder/latest)
-
-###### Travis
-[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=master)](https://travis-ci.org/avTranscoder/avTranscoder)
-
-###### Coverity Scan  
-<a href="https://scan.coverity.com/projects/2626">
-  <img alt="Coverity Scan Build Status"
-       src="https://scan.coverity.com/projects/2626/badge.svg"/>
-</a>
-
 #### Tests
 
 ###### nosetests
diff --git a/tools/travis.gcc.generate.coverage.sh b/tools/travis.gcc.generate.coverage.sh
@@ -0,0 +1,11 @@
+# capture coverage info
+lcov --capture --directory ${AVTRANSCODER_BUILD} --output-file coverage.info
+
+# filter out system and test code
+lcov --remove coverage.info '/usr/*' '*/*PYTHON_wrap.*' --output-file coverage.info
+
+# debug before upload
+lcov --list coverage.info
+
+# uploads to coveralls
+coveralls-lcov --repo-token e7jYJJrojzWYfmdUgkDvwVNGqJgh6yCH7 coverage.info
diff --git a/tools/travis.gcc.install.coverage.sh b/tools/travis.gcc.install.coverage.sh
@@ -0,0 +1,13 @@
+# install latest LCOV (1.9 was failing for me)
+wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz
+tar xf lcov_1.11.orig.tar.gz
+sudo make -C lcov-1.11/ install
+
+# install lcov to coveralls conversion + upload tool
+gem install coveralls-lcov
+
+# init coverage to 0 (optional)
+lcov --directory ${AVTRANSCODER_BUILD} --zerocounters
+
+# install nosetests plugins
+sudo pip install coverage
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Get avtranscoder library
-export PYTHONPATH=`pwd`/build/dist/lib/python2.7.6/site-packages/:$PYTHONPATH
+export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
 
 # Get avtranscoder profiles
-export AVPROFILES=`pwd`/build/dist/share/ressource
+export AVPROFILES=${AVTRANSCODER_INSTALL}/share/ressource
 
 # Get assets
 git clone https://github.com/avTranscoder/avTranscoder-data.git
@@ -13,5 +13,4 @@ export AVTRANSCODER_TEST_AUDIO_WAVE_FILE=`pwd`/avTranscoder-data/audio/frequenci
 export AVTRANSCODER_TEST_AUDIO_MOV_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_1080p_5_1.mov
 
 # Launch tests
-cd test/pyTest
-nosetests
+nosetests ${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage
