aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-01-06 20:40:43 +0100
committerGitHub <noreply@github.com>2019-01-06 20:40:43 +0100
commitb6d28c263b66e7b19e748a4ec78a913fa80fc0bd (patch)
treef0566fb324d303e4af5749163eac44b5d253b447
parent0fbe7cf33c308c4b7c81e65e18b90e9d773ba333 (diff)
parentc9c4ef4efdac6477168b639f6c151fc622c482bc (diff)
downloadPROJ-b6d28c263b66e7b19e748a4ec78a913fa80fc0bd.tar.gz
PROJ-b6d28c263b66e7b19e748a4ec78a913fa80fc0bd.zip
Merge pull request #1216 from kbevers/fix-coveralls
Make sure that coveralls reports coverage from both c and cpp files
-rwxr-xr-xtravis/after_success.sh4
-rwxr-xr-xtravis/install.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/travis/after_success.sh b/travis/after_success.sh
index 2ae34bc8..0adb6d77 100755
--- a/travis/after_success.sh
+++ b/travis/after_success.sh
@@ -2,10 +2,10 @@
set -e
-
if [ "$BUILD_NAME" != "linux_clang" ]; then
# coveralls falsely reports .c-files in the build directories as having 100% coverage so we exclude them
- coveralls --extension .c --exclude build_autoconf --exclude build_cmake
+ coveralls --build-root src --extension .c --extension .cpp \
+ --exclude build_autoconf --exclude build_cmake --exclude test --exclude examples
fi
echo "$TRAVIS_SECURE_ENV_VARS"
diff --git a/travis/install.sh b/travis/install.sh
index 14fe21e2..2013a610 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -83,4 +83,8 @@ make check
if [ "$BUILD_NAME" != "linux_clang" ]; then
mv src/.libs/*.gc* src
+ mv src/conversions/.libs/*.gc* src/conversions
+ mv src/iso19111/.libs/*.gc* src/iso19111
+ mv src/projections/.libs/*.gc* src/projections
+ mv src/transformations/.libs/*.gc* src/transformations
fi