Backport #369: Integrate with Coveralls (#473)

Ingvord · web-flow · commit 62e9818e3b69 · 2018-08-28T19:26:58.000Z
* Backport #369: Integrate with Coveralls [25min] * fix build with coveralls [5min] * Update .travis.yml Fix coveralls build * Backport #369: Integrate with Coveralls; run coveralls [1h] * disable log4tango bench test * Update run.sh [0,5h] * some refactoring [1h] * Make .travis/**.sh executable * Update coveralls.cmake [5min] * Update README.md * add coverage report path [0,5h] * integrate sonar and coveralls [0,25h]
diff --git a/.travis.yml b/.travis.yml
@@ -5,11 +5,11 @@ language: cpp
 
 env:
   matrix:
-    - OS_TYPE=debian9 CMAKE_BUILD_TYPE=DEBUG SONAR_SCANNER=OFF
-    - OS_TYPE=debian9 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF
-    - OS_TYPE=debian8 CMAKE_BUILD_TYPE=DEBUG SONAR_SCANNER=ON
-    - OS_TYPE=debian8 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF
-    - OS_TYPE=debian7 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF
+    - OS_TYPE=debian9 CMAKE_BUILD_TYPE=DEBUG SONAR_SCANNER=OFF COVERALLS=OFF
+    - OS_TYPE=debian9 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF COVERALLS=OFF
+    - OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON
+    - OS_TYPE=debian8 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF COVERALLS=OFF
+    - OS_TYPE=debian7 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF COVERALLS=OFF
 #    - OS_TYPE=debian7 CMAKE_BUILD_TYPE=DEBUG
 #    - OS_TYPE=win32
 # etc
@@ -25,27 +25,33 @@ addons:
     organization: "tango-controls"
     token:
       secure: ${SONAR_TOKEN}
+  apt:
+    update: true
 
 before_install:
-  - chmod +x .travis/${OS_TYPE}/before_install.sh
-  - .travis/${OS_TYPE}/before_install.sh
   - 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
-  - chmod +x .travis/${OS_TYPE}/run.sh
+  - 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=""
   - CONTAINER=$(docker run --name tango_cs -e TANGO_HOST=127.0.0.1:10000 -e MYSQL_HOST=mysql_db:3306 -e MYSQL_USER=tango -e MYSQL_PASSWORD=tango -e MYSQL_DATABASE=tango --link mysql_db:mysql_db -d tangocs/tango-cs:latest)
   - IPADDR=$(docker inspect -f '{{ .NetworkSettings.IPAddress }}' $CONTAINER)
   - TANGO_HOST=${IPADDR}:10000
   - docker build --build-arg APP_UID=$(id -u) --build-arg APP_GID=$(id -g) -t cpp_tango .travis/${OS_TYPE}
-  - docker run --name cpp_tango -e TANGO_HOST=${TANGO_HOST} -e BINTRAY_USER_NAME=tango-ci -e BINTRAY_API_KEY=${CI_BINTRAY_API_KEY} --link tango_cs:tango_cs -v `pwd`:/home/tango/src -v `pwd`/idl:/home/tango/idl -v `pwd`/cppzmq:/home/tango/cppzmq -dit cpp_tango
+  - docker run --name cpp_tango -e TANGO_HOST=${TANGO_HOST} -e BINTRAY_USER_NAME=tango-ci -e BINTRAY_API_KEY=${CI_BINTRAY_API_KEY} -e COVERALLS_REPO_TOKEN=${COVERALLS_REPO_TOKEN} --link tango_cs:tango_cs -v `pwd`:/home/tango/src -v `pwd`/idl:/home/tango/idl -v `pwd`/cppzmq:/home/tango/cppzmq -v `pwd`/coveralls-cmake:/home/tango/coveralls-cmake -dit cpp_tango
+  - .travis/install_tango_idl.sh
+  - .travis/install_cppzmq.sh
 
 script:
   - .travis/${OS_TYPE}/run.sh
+  - .travis/test.sh COVERALLS=OFF
 
 after_success:
+  - test ${COVERALLS} = "ON" && gcovr -r . -x --object-directory=/home/tango/src/build > report.xml
   - test ${SONAR_SCANNER} = "ON" && sonar-scanner
 
 deploy:
diff --git a/.travis/debian7/Dockerfile b/.travis/debian7/Dockerfile
@@ -24,6 +24,8 @@ RUN /tmp/cmake-install.sh --skip-license --exclude-subdir
 
 RUN apt-get install -y omniidl libomniorb4-dev libcos4-dev libomnithread3-dev libzmq3-dev
 
+RUN apt-get update && apt-get install -y curl
+
 RUN groupadd -g "$APP_GID" tango
 
 RUN useradd -u "$APP_UID" -g "$APP_GID" -ms /bin/bash tango
diff --git a/.travis/debian7/before_install.sh b/.travis/debian7/before_install.sh
diff --git a/.travis/debian7/run.sh b/.travis/debian7/run.sh
@@ -1,29 +1,6 @@
 #!/usr/bin/env bash
-docker exec cpp_tango mkdir -p /home/tango/idl/build
-docker exec cpp_tango mkdir -p /home/tango/cppzmq/build
-docker exec cpp_tango mkdir -p /home/tango/src/build
 
-echo "Build cppzmq"
-docker exec cpp_tango cmake -H/home/tango/cppzmq -B/home/tango/cppzmq/build -DCMAKE_INSTALL_PREFIX=/home/tango
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-echo "Install cppzmq"
-docker exec cpp_tango make -C /home/tango/cppzmq/build install
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-
-echo "Build tango-idl"
-docker exec cpp_tango cmake -H/home/tango/idl -B/home/tango/idl/build -DCMAKE_INSTALL_PREFIX=/home/tango
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-echo "Install tango-idl"
-docker exec cpp_tango make -C /home/tango/idl/build install
+docker exec cpp_tango mkdir -p /home/tango/src/build
 
 echo "Build cppTango:$CMAKE_BUILD_TYPE"
 docker exec cpp_tango cmake -H/home/tango/src -B/home/tango/src/build -DCMAKE_VERBOSE_MAKEFILE=true -DCPPZMQ_BASE=/home/tango -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
@@ -32,8 +9,4 @@ then
     exit -1
 fi
 
-docker exec cpp_tango make -C /home/tango/src/build -j 2
-echo "Test log4tango"
-docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/log4tango; exec ctest -V'
-echo "Test cppTango"
-docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/cpp_test_suite; exec ctest -V'
+docker exec cpp_tango make -C /home/tango/src/build -j 2
diff --git a/.travis/debian8/Dockerfile b/.travis/debian8/Dockerfile
@@ -14,6 +14,8 @@ 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 groupadd -g "$APP_GID" tango
 
 RUN useradd -u "$APP_UID" -g "$APP_GID" -ms /bin/bash tango
diff --git a/.travis/debian8/before_install.sh b/.travis/debian8/before_install.sh
diff --git a/.travis/debian8/run.sh b/.travis/debian8/run.sh
@@ -1,25 +1,16 @@
 #!/usr/bin/env bash
-docker exec cpp_tango mkdir -p /home/tango/idl/build
+#this script is executed from within Travis environment. TANGO_HOST is already set
+echo "TANGO_HOST=$TANGO_HOST"
+
 docker exec cpp_tango mkdir -p /home/tango/src/build
 
-echo "Build tango-idl"
-docker exec cpp_tango cmake -H/home/tango/idl -B/home/tango/idl/build -DCMAKE_INSTALL_PREFIX=/home/tango
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-echo "Install tango-idl"
-docker exec cpp_tango make -C /home/tango/idl/build install
+echo "Run cmake cppTango in $CMAKE_BUILD_TYPE mode"
+echo "Using COVERALLS=$COVERALLS"
 
-echo "Build cppTango:$CMAKE_BUILD_TYPE"
-docker exec cpp_tango cmake -H/home/tango/src -B/home/tango/src/build -DCMAKE_VERBOSE_MAKEFILE=true -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
+docker exec cpp_tango cmake -H/home/tango/src -B/home/tango/src/build -DCOVERALLS=$COVERALLS -DCOVERALLS_MODULE_PATH=/home/tango/coveralls-cmake/cmake -DCMAKE_VERBOSE_MAKEFILE=true -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
 if [ $? -ne "0" ]
 then
     exit -1
 fi
 
-docker exec cpp_tango make -C /home/tango/src/build -j 2
-echo "Test log4tango"
-docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/log4tango; exec ctest -V'
-echo "Test cppTango"
-docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/cpp_test_suite; exec ctest -V'
+docker exec cpp_tango make -C /home/tango/src/build -j 2
diff --git a/.travis/debian9/before_install.sh b/.travis/debian9/before_install.sh
diff --git a/.travis/debian9/run.sh b/.travis/debian9/run.sh
@@ -1,39 +1,11 @@
 #!/usr/bin/env bash
-docker exec cpp_tango mkdir -p /home/tango/idl/build
-docker exec cpp_tango mkdir -p /home/tango/cppzmq/build
 docker exec cpp_tango mkdir -p /home/tango/src/build
 
-echo "Build cppzmq"
-docker exec cpp_tango cmake -H/home/tango/cppzmq -B/home/tango/cppzmq/build -DCMAKE_INSTALL_PREFIX=/home/tango
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-echo "Install cppzmq"
-docker exec cpp_tango make -C /home/tango/cppzmq/build install
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-
-echo "Build tango-idl"
-docker exec cpp_tango cmake -H/home/tango/idl -B/home/tango/idl/build -DCMAKE_INSTALL_PREFIX=/home/tango
-if [ $? -ne "0" ]
-then
-    exit -1
-fi
-echo "Install tango-idl"
-docker exec cpp_tango make -C /home/tango/idl/build install
-
 echo "Build cppTango:$CMAKE_BUILD_TYPE"
 docker exec cpp_tango cmake -H/home/tango/src -B/home/tango/src/build -DCMAKE_VERBOSE_MAKEFILE=true -DCPPZMQ_BASE=/home/tango -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
 if [ $? -ne "0" ]
 then
     exit -1
 fi
 
-docker exec cpp_tango make -C /home/tango/src/build -j 2
-echo "Test log4tango"
-docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/log4tango; exec ctest -V'
-echo "Test cppTango"
-docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/cpp_test_suite; exec ctest -V'
+docker exec cpp_tango make -C /home/tango/src/build -j 2
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
diff --git a/.travis/install_cppzmq.sh b/.travis/install_cppzmq.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+docker exec cpp_tango mkdir -p /home/tango/cppzmq/build
+
+echo "Build cppzmq"
+docker exec cpp_tango cmake -H/home/tango/cppzmq -B/home/tango/cppzmq/build -DCMAKE_INSTALL_PREFIX=/home/tango
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
+echo "Install cppzmq"
+docker exec cpp_tango make -C /home/tango/cppzmq/build install
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
diff --git a/.travis/install_tango_idl.sh b/.travis/install_tango_idl.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+docker exec cpp_tango mkdir -p /home/tango/idl/build
+
+echo "Build tango-idl"
+docker exec cpp_tango cmake -H/home/tango/idl -B/home/tango/idl/build -DCMAKE_INSTALL_PREFIX=/home/tango
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
+echo "Install tango-idl"
+docker exec cpp_tango make -C /home/tango/idl/build install
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
diff --git a/.travis/test.sh b/.travis/test.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+TEST_COMMAND="exec ctest"
+if [ $COVERALLS = "ON" ]
+then
+    TEST_COMMAND="exec make coveralls"
+fi
+
+echo "PreTest"
+docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/cpp_test_suite/environment; exec ./pre_test.sh'
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
+echo "Test"
+echo "TEST_COMMAND=$TEST_COMMAND"
+docker exec cpp_tango /bin/sh -c "cd /home/tango/src/build; $TEST_COMMAND"
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
+
+echo "PostTest"
+docker exec cpp_tango /bin/sh -c 'cd /home/tango/src/build/cpp_test_suite/environment; exec ./post_test.sh'
+if [ $? -ne "0" ]
+then
+    exit -1
+fi
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@
 
 [![Build Status](https://travis-ci.org/tango-controls/cppTango.svg?branch=tango-9-lts)](https://travis-ci.org/tango-controls/cppTango)
 [![Build status](https://ci.appveyor.com/api/projects/status/avaox4tnjm7vff13/branch/tango-9-lts?svg=true)](https://ci.appveyor.com/project/bourtemb/cpptango-tt3w8/branch/tango-9-lts)
+[![Coverage Status](https://coveralls.io/repos/github/tango-controls/cppTango/badge.svg?branch=master)](https://coveralls.io/github/tango-controls/cppTango?branch=master)
 
 [![release](https://img.shields.io/github/release/tango-controls/cppTango.svg?style=flat)](https://github.com/tango-controls/cppTango/releases/9.3.0)
 
diff --git a/configure/CMakeLists.txt b/configure/CMakeLists.txt
@@ -1,8 +1,15 @@
 include(FindPkgConfig)
+include(FindDoxygen)
+include(GNUInstallDirs)
 
 if(NOT CMAKE_BUILD_TYPE)
-    message("No build type specified - default is Release")
-    set(CMAKE_BUILD_TYPE Release)
+    message("No build type specified - default is RELEASE")
+    set(CMAKE_BUILD_TYPE RELEASE)
+endif()
+
+if(NOT TANGO_DEVICE_SERVER_PATH)
+    #TODO windows
+    set(TANGO_DEVICE_SERVER_PATH ${CMAKE_INSTALL_FULL_BINDIR})
 endif()
 
 if(CPPZMQ_BASE)
@@ -109,7 +116,7 @@ if(PTHREAD_WIN)
     message("Using PTHREAD_WIN=${PTHREAD_WIN}")
     add_definitions(-DHAVE_PTHREAD_NP_H)
     set(PTHREAD_WIN_PKG_INCLUDE_DIRS ${PTHREAD_WIN}/include)
-    
+
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(PTHREAD_WIN_PKG_LIBRARIES_DYN "pthreadVC2d.lib")
         set(PTHREAD_WIN_PKG_LIBRARIES_STA "pthreadVC2-sd.lib")
@@ -173,7 +180,7 @@ if(NOT WIN32)
     #setup for GNU CXX compiler
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         message("found GNU compiler ...")
-        if(CMAKE_BUILD_TYPE MATCHES Release)
+        if(CMAKE_BUILD_TYPE MATCHES RELEASE)
             message("setup for release build ...")
             add_definitions(-D_FORTIFY_SOURCE=2)
         else()
@@ -183,3 +190,4 @@ if(NOT WIN32)
     endif()
 endif()
 include(GNUInstallDirs)
+include(configure/coveralls.cmake)
diff --git a/configure/coveralls.cmake b/configure/coveralls.cmake
@@ -0,0 +1,18 @@
+option(COVERALLS "Generate coveralls data" OFF)
+
+if (COVERALLS)
+    # Add project cmake modules to path.
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${COVERALLS_MODULE_PATH})
+
+    include(Coveralls)
+    coveralls_turn_on_coverage()
+
+    FILE(GLOB_RECURSE COVERAGE_SRCS ${PROJECT_SOURCE_DIR}/cppapi/*.cpp ${PROJECT_SOURCE_DIR}/cppapi/*.h)
+
+    # Create the coveralls target.
+    coveralls_setup(
+            "${COVERAGE_SRCS}" # The source files.
+            ON                 # If we should upload.
+    )
+endif ()
+
diff --git a/log4tango/tests/CMakeLists.txt b/log4tango/tests/CMakeLists.txt
@@ -20,14 +20,14 @@ if(WIN32)
     endif()
 
     add_test("log4tango_test_dyn"       test_log4tango_dyn)
-    add_test("log4tango_benchmark_dyn"  test_bench_dyn)
+#    add_test("log4tango_benchmark_dyn"  test_bench_dyn)
     add_test("log4tango_test_sta"       test_log4tango_sta)
-    add_test("log4tango_benchmark_sta"  test_bench_sta)
+#    add_test("log4tango_benchmark_sta"  test_bench_sta)
 
 else(WIN32)
     add_executable(test_log4tango ${LOG4TANGO_TEST_SOURCES} $<TARGET_OBJECTS:log4tango_objects>)
     add_executable(test_bench ${BENCH_TEST_SOURCES} $<TARGET_OBJECTS:log4tango_objects>)
 
     add_test("log4tango_test"       test_log4tango)
-    add_test("log4tango_benchmark"  test_bench)
+#    add_test("log4tango_benchmark"  test_bench)
 endif(WIN32)
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -9,3 +9,5 @@ sonar.sources=cppapi
 sonar.sourceEncoding=UTF-8
 
 sonar.cfamily.build-wrapper-output.bypass=true
+
+sonar.cxx.coverage.reportPath=report.xml
