Merge branch 'backport-intergrate-coveralls' into tango-9-lts

Conflicts:
	.travis.yml
	.travis/debian8/Dockerfile

Author: Ingvord

.travis.yml

@@ -25,16 +25,13 @@ addons:
     organization: "tango-controls"
     token:
       secure: ${SONAR_TOKEN}
-  apt:
-    update: true
 
 before_install:
   - docker pull tangocs/mysql:9.2.2
   - docker pull tangocs/tango-cs:latest
   - git clone https://github.com/JoakimSoderberg/coveralls-cmake.git
   - git clone -b v4.2.2 https://${CI_USER_TOKEN}@github.com/zeromq/cppzmq.git cppzmq
   - git clone -b tango-9-lts https://${CI_USER_TOKEN}@github.com/tango-controls/tango-idl.git idl
-  - sudo apt-get install -y gcovr
 
 before_script:
   - docker run --name mysql_db -e MYSQL_ROOT_PASSWORD=root -d tangocs/mysql:9.2.2 --sql-mode=""
@@ -51,7 +48,7 @@ script:
   - .travis/test.sh COVERALLS=OFF
 
 after_success:
-  - test ${COVERALLS} = "ON" && gcovr -r . -x --object-directory=/home/tango/src/build > report.xml
+  - test ${COVERALLS} = "ON" && .travis/coverage.sh
   - test ${SONAR_SCANNER} = "ON" && sonar-scanner
 
 deploy:

.travis/coverage.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+docker exec cpp_tango /bin/sh -c 'cd /home/tango/src; gcovr --root /home/tango/src --use-gcov-files --xml --output report.xml --verbose /home/tango/src/build'

.travis/debian8/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get install -y curl lsb-release
 
 RUN apt-get install -y omniidl libomniorb4-dev libcos4-dev libomnithread3-dev libzmq3-dev
 
-RUN apt-get update && apt-get install -y curl
+RUN apt-get update && apt-get install -y curl gcovr
 
 RUN groupadd -g "$APP_GID" tango