[geos-commits] [SCM] GEOS branch master updated. 4c5cab618ca09f10ae3684e832084c2c2bcf3867

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  4c5cab618ca09f10ae3684e832084c2c2bcf3867 (commit)
       via  366cc04962fafa898c43d9b91848d5c7b58fc82f (commit)
       via  9b0be18a088a9aa6972919f757488a07e96f32a4 (commit)
      from  9f2a3599a2977ea8ce0658395f8f668cfb1c4ca3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c5cab618ca09f10ae3684e832084c2c2bcf3867
Merge: 9f2a359 366cc04
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed May 29 16:57:18 2019 -0400

    Merge branch 'coverage'


commit 366cc04962fafa898c43d9b91848d5c7b58fc82f
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed May 29 16:46:21 2019 -0400

    Exclude vendored libs from codecov

diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 0000000..9f7f0f6
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,7 @@
+coverage:
+  precision: 2
+
+ignore:
+  - "include/geos/algorithm/ttmath"
+  - "tests/unit/tut"
+  - "tests/xmltester/tinyxml2"

commit 9b0be18a088a9aa6972919f757488a07e96f32a4
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed May 29 15:45:24 2019 -0400

    Report code coverage from Travis
    
    [skip appveyor]

diff --git a/.travis.yml b/.travis.yml
index f02b214..c4d7633 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,19 @@ matrix:
           sources: *sources
           packages: ['g++-7','cmake','ccache']
       env:
-        - E="TOOL=cmake && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
+        - E="TOOL=cmake && BUILD_TYPE=Release && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
+
+    - os: linux
+      cache:
+        apt: true
+        directories:
+          - $HOME/.ccache
+      addons:
+        apt:
+          sources: *sources
+          packages: ['g++-7','cmake','ccache']
+      env:
+        - E="TOOL=cmake && BUILD_TYPE=Coverage && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
 
     - os: linux
       cache:
@@ -53,7 +65,7 @@ matrix:
           sources: *sources
           packages: ['g++-4.8','cmake','ccache']
       env:
-        - E="TOOL=cmake && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
+        - E="TOOL=cmake && BUILD_TYPE=Release && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
 
     - os: linux
       cache:
@@ -77,7 +89,7 @@ matrix:
           sources: *sources
           packages: ['clang-3.9','cmake','ccache']
       env:
-        - E="TOOL=cmake && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
+        - E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
 
     - os: linux
       cache:
@@ -89,13 +101,14 @@ matrix:
           sources: *sources
           packages: ['clang','cmake','ccache']
       env:
-        - E="TOOL=cmake && CXX=clang++ && ARCH=-m64 && CC=clang"
+        - E="TOOL=cmake && BUILD_TYPE=Release && CXX=clang++ && ARCH=-m64 && CC=clang"
 
 before_install:
   - eval "${E}"
   - export CXXFLAGS=${ARCH}
   - export CFLAGS=${ARCH}
   - export GEOS_BUILD_TOOL=${TOOL}
+  - export BUILD_TYPE=${BUILD_TYPE}
   - export CXX="ccache ${CXX}"
   - ${CXX} --version
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f9b71b..9045f78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,8 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD)
   set(GEOS_BUILD_FROM_GIT ON)
 endif()
 
+message(STATUS "GEOS: Build type: ${CMAKE_BUILD_TYPE}")
+
 #-----------------------------------------------------------------------------
 # Options
 #-----------------------------------------------------------------------------
@@ -195,6 +197,11 @@ if(WIN32)
 endif()
 
 #-----------------------------------------------------------------------------
+# Define a coverage build
+#-----------------------------------------------------------------------------
+set(CMAKE_CXX_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage")
+
+#-----------------------------------------------------------------------------
 # Target geos: C++ API library
 #-----------------------------------------------------------------------------
 add_library(geos "")
diff --git a/tools/ci/script_cmake.sh b/tools/ci/script_cmake.sh
index 069d392..583ff6b 100755
--- a/tools/ci/script_cmake.sh
+++ b/tools/ci/script_cmake.sh
@@ -13,6 +13,10 @@ source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
 
 cmake --version
 
-cmake ${TRAVIS_BUILD_DIR}
+cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${TRAVIS_BUILD_DIR}
 run_make
 ctest --output-on-failure .
+
+if [ "${BUILD_TYPE}" = "Coverage" ]; then
+    bash <(curl -s https://codecov.io/bash)
+fi

-----------------------------------------------------------------------

Summary of changes:
 .codecov.yml             |  7 +++++++
 .travis.yml              | 21 +++++++++++++++++----
 CMakeLists.txt           |  7 +++++++
 tools/ci/script_cmake.sh |  6 +++++-
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 .codecov.yml


hooks/post-receive
-- 
GEOS