From d612eafe174e57bad9061af3ddf0a145fe359591 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Fri, 11 Aug 2017 06:40:44 -0700
Subject: Use updated gcov tool.

---
 .travis.yml     |  2 +-
 etc/codecov.sh  | 12 +++++++++++-
 etc/coverage.sh | 12 +++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1cd539e5..2c46dab3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - gcc-7
-      env: CC=gcc-7 COVERAGE=ON
+      env: CC=gcc-7 COVERAGE=ON GCOV=gcov-7
 
     # One MacOS X build
     - os: osx
diff --git a/etc/codecov.sh b/etc/codecov.sh
index 58ce44fc..5ecdc55f 100755
--- a/etc/codecov.sh
+++ b/etc/codecov.sh
@@ -1,10 +1,20 @@
 #!/bin/bash
 
+# Copyright 2017 Garrett D'Amore <garrett@damore.org>
+# Copyright 2017 Capitar IT Group BV <info@capitar.com>
+#
+# This software is supplied under the terms of the MIT License, a
+# copy of which should be located in the distribution where this
+# file was obtained (LICENSE.txt).  A copy of the license may also be
+# found online at https://opensource.org/licenses/MIT.
+
 if [ "${COVERAGE}" != ON ]
 then
 	echo "Code coverage not enabled."
 	exit 0
 fi
 
-bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage"
+GCOV=${GCOV:-gcov}
+
+bash <(curl -s https://codecov.io/bash) -x gcov || echo "Codecov did not collect coverage"
 echo 0
diff --git a/etc/coverage.sh b/etc/coverage.sh
index 5afc0979..6f7355dc 100755
--- a/etc/coverage.sh
+++ b/etc/coverage.sh
@@ -1,13 +1,23 @@
 #!/bin/bash
 
+# Copyright 2017 Garrett D'Amore <garrett@damore.org>
+# Copyright 2017 Capitar IT Group BV <info@capitar.com>
+#
+# This software is supplied under the terms of the MIT License, a
+# copy of which should be located in the distribution where this
+# file was obtained (LICENSE.txt).  A copy of the license may also be
+# found online at https://opensource.org/licenses/MIT.
+
 if [ "${COVERAGE}" != ON ]
 then
 	echo "Code coverage not enabled."
 	exit 0
 fi
 
+GCOV=${GCOV:-gcov}
+
 # capture all coverage info
-lcov --directory . --capture --output-file coverage.info || exit 1
+lcov --gcov-tool ${GCOV} --directory . --capture --output-file coverage.info || exit 1
 
 # filter out system information (C++ templates & inlines)
 lcov --remove coverage.info '/usr/*' --output-file coverage.info || exit 1
-- 
cgit v1.2.3-70-g09d2