Merge pull request #16 from john-gress/support_g++_6.5.0

Changes needed to compile with g++ 6.5.0.
logrhythm · Feb 18, 2020 · b7e073a · b7e073a
2 parents 01fa42e + 63b1c40
commit b7e073a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/CodeCoverage.py b/scripts/CodeCoverage.py
@@ -11,7 +11,7 @@
 import os.path
 
 DEFAULT_WHITELIST = ".*cpp$"
-DEFAULT_BLACKLIST = "/usr/local/probe/.*"
+DEFAULT_BLACKLIST = "/usr/local/probe/.*|.*coverage/CMakeCXXCompilerId.*"
 
 CMAKEFILEPATH = "CMakeLists.txt"
 LIBRARY_TO_BUILD_REGEX = 'SET\(LIBRARY_TO_BUILD (.*)\)$'
@@ -165,9 +165,9 @@ def main(argv):
     GTEST_ZIP_PATH = LAUNCH_DIR + '/thirdparty/gtest-1.7.0.zip'
     global PROBE_BUILD
     global DEFAULT_BLACKLIST
-    if os.path.exists("/usr/local/probe/bin/cmake"):
+    if os.path.exists("/usr/local/probe/bin/gcovr"):
         PROBE_BUILD=True
-        print "Using /usr/local/probe as the default path"
+        print "Using /usr/local/gcc/bin and /usr/local/probe/bin as the default paths"
     else: 
        PROBE_BUILD=False
        print "Using /usr/local/ as the default path"