Merge pull request #17 from DCM-UPB/travis

TravisCI and more

Author: Ithanil

.travis.yml

@@ -0,0 +1,87 @@
+dist: xenial
+language: c++
+services:
+- docker
+
+addons:
+  apt:
+    packages:
+    - cmake
+    - valgrind
+    - python-pip
+
+  homebrew:
+    packages:
+    - cmake
+    - valgrind
+
+matrix:
+  include:
+  - os: linux // travis ubuntu xenial
+    env:
+    - MYCXX="g++"
+    - USE_DOCKER="FALSE"
+    - USE_GCOV="TRUE"
+
+  - os: linux // arch linux docker
+    env:
+    - MYCXX="g++"
+    - USE_DOCKER="TRUE"
+    - USE_GCOV="FALSE"
+
+  - os: osx
+    osx_image: xcode10.1
+    env:
+    - MYCXX="g++"
+    - USE_DOCKER="FALSE"
+    - USE_GCOV="FALSE"
+
+  - os: osx
+    osx_image: xcode10.1
+    env:
+    - MYCXX="clang++"
+    - USE_DOCKER="FALSE"
+    - USE_GCOV="FALSE"
+
+before_install:
+- |
+  if [[ "$USE_DOCKER" == "TRUE" ]]; then
+  docker pull nnvmc/base;
+  else
+  ${MYCXX} -v;
+  fi;
+  echo "CXX_COMPILER=${MYCXX}" >> config.sh;
+  echo "CXX_FLAGS=\"-O0 -g -Wall -Wno-unused-function ${configopt}\"" >> config.sh;
+  if [[ "$USE_GCOV" == "TRUE" ]]; then echo "USE_COVERAGE=1" >> config.sh;
+  else
+  echo "USE_COVERAGE=0" >> config.sh;
+  fi;
+
+script:
+- |
+  if [[ "$USE_DOCKER" == "TRUE" ]]; then
+  docker run -it -v $(pwd):/root/repo nnvmc/base /bin/bash -c "cd /root/repo && ./build.sh" || exit 1;
+  else
+  ./build.sh || exit 1;
+  fi;
+- |
+  if [[ "$USE_DOCKER" == "TRUE" ]]; then
+  if [[ "$USE_GCOV" == "TRUE" ]]; then
+  docker run -it -v $(pwd):/root/repo nnvmc/base /bin/bash -c "cd /root/repo/test && ./run.sh";
+  docker run -e TRAVIS=$TRAVIS -e TRAVIS_JOB_ID=$TRAVIS_JOB_ID -it -v $(pwd):/root/repo nnvmc/base /bin/bash -c "pip install cpp-coveralls && cd /root/repo/build && coveralls --verbose -b ./ -r ../ -i include -i src -x .cpp -x .hpp --gcov-options '\-lp'";
+  else
+  docker run -it -v $(pwd):/root/repo nnvmc/base /bin/bash -c "cd /root/repo/test && ./run.sh";
+  fi;
+  else
+  if [[ "$USE_GCOV" == "TRUE" ]]; then
+  cd build && make test && cd .. ;
+  pip install --user cpp-coveralls && cd build && coveralls --verbose -b ./ -r ../ -i include -i src -x .cpp -x .hpp --gcov-options '\-lp';
+  else
+  cd test && ./run.sh && cd .. ;
+  fi;
+  fi;
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change

CMakeLists.txt

@@ -8,9 +8,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${USER_CXX_FLAGS}")
 
+if (USE_COVERAGE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+endif()
+
 # find packages
-message(STATUS "Configured CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
-message(STATUS "Configured CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 
 find_package(MPI)
 if (MPI_FOUND)
@@ -20,6 +22,9 @@ if (MPI_FOUND)
   message(STATUS "MPI_CXX_LIBRARIES: ${MPI_CXX_LIBRARIES}")
 endif()
 
+message(STATUS "Configured CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") 
+message(STATUS "Configured CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+
 # set header / library paths
 include_directories(include/) # headers
 
@@ -29,4 +34,3 @@ enable_testing()
 add_subdirectory(src) 
 add_subdirectory(test)
 add_subdirectory(examples)
-

README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.com/DCM-UPB/MCIntegratorPlusPlus.svg?branch=master)](https://travis-ci.com/DCM-UPB/MCIntegratorPlusPlus)
+[![Coverage Status](https://coveralls.io/repos/github/DCM-UPB/MCIntegratorPlusPlus/badge.svg?branch=master)](https://coveralls.io/github/DCM-UPB/MCIntegratorPlusPlus?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/4fb9f98862c7474b86c8ef88b501b454)](https://www.codacy.com/app/NNVMC/MCIntegratorPlusPlus?utm_source=github.com&utm_medium=referral&utm_content=DCM-UPB/MCIntegratorPlusPlus&utm_campaign=Badge_Grade)
+[![CodeFactor](https://www.codefactor.io/repository/github/dcm-upb/mcintegratorplusplus/badge)](https://www.codefactor.io/repository/github/dcm-upb/mcintegratorplusplus)
 
 # MCIntegrator++
 

build.sh

@@ -2,5 +2,5 @@
 . ./config.sh
 mkdir -p build
 cd build
-cmake -DCMAKE_CXX_COMPILER="${CXX_COMPILER}" -DUSER_CXX_FLAGS="${CXX_FLAGS}" ..
+cmake -DCMAKE_CXX_COMPILER="${CXX_COMPILER}" -DUSER_CXX_FLAGS="${CXX_FLAGS}" -DUSE_COVERAGE="${USE_COVERAGE}" ..
 make

config_template.sh

@@ -1,8 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 #C++ compiler
 CXX_COMPILER="g++"
 
 # C++ flags
 CXX_FLAGS="-O3 -flto -Wall -Wno-unused-function"
 
+# add coverage flags
+USE_COVERAGE=0

doc/doxygen/doxygen.conf

@@ -791,7 +791,8 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = "../../src" \
+INPUT                  = "../../include/mci" \
+                         "../../src" \
                          "doxygen_stl.cpp"
 
 # This tag can be used to specify the character encoding of the source files

src/CMakeLists.txt

@@ -6,3 +6,8 @@ if (MPI_FOUND)
   target_link_libraries(mci ${MPI_CXX_LIBRARIES})
   target_link_libraries(mci_static ${MPI_CXX_LIBRARIES})
 endif()
+
+if (USE_COVERAGE)
+  target_link_libraries(mci --coverage)
+  target_link_libraries(mci_static --coverage)
+endif()

src/Estimators.cpp

@@ -257,10 +257,9 @@ namespace mci
         double ** err = new double*[MAX_BLOCKS-MIN_BLOCKS+1];
         for (int j=0; j<MAX_BLOCKS-MIN_BLOCKS+1; ++j){ *(err+j) = new double[ndim]; }
 
-        int nblocks;
         for (int i1=0; i1<MAX_BLOCKS-MIN_BLOCKS+1; ++i1)
             {
-                nblocks=i1+MIN_BLOCKS;
+                const int nblocks=i1+MIN_BLOCKS;
                 MultiDimBlockEstimator(n, ndim, x, nblocks, *(av+i1), *(err+i1));
             }
 

test/CMakeLists.txt

@@ -1,5 +1,9 @@
 include_directories(common/)
 link_libraries(mci)
+if (USE_COVERAGE)
+  link_libraries(--coverage)
+endif()
+
 add_executable(check main.cpp)
 add_executable(ut1.exe ut1/main.cpp)
 add_executable(ut2.exe ut2/main.cpp)