Some code coverage fixes

This is still broken but it's already better

CMakeLists.txt

@@ -13,7 +13,6 @@ include(CheckFunctionExists)
 include(CheckSymbolExists)
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
-include(CodeCoverage)
 include(EnableCFlag)
 include(FindPkgConfig)
 include(TrySanitizer)

src/bin/testrunner/CMakeLists.txt

@@ -8,12 +8,15 @@ target_link_libraries(testrunner
 )
 
 if (${CMAKE_BUILD_TYPE} MATCHES "Coverage")
+	include(CodeCoverage)
+
 	if (Python3_Interpreter_FOUND)
-		setup_target_for_coverage(generate-coverage
-			"${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scripts/testsuite.py -v ${CMAKE_BINARY_DIR}"
-			coverage
+		setup_target_for_coverage_lcov(
+			NAME generate-coverage
+			EXECUTABLE ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scripts/testsuite.py -v ${CMAKE_BINARY_DIR}
+			DEPENDENCIES testrunner
+			BASE_DIRECTORY "${CMAKE_SOURCE_DIR}"
 		)
-		add_dependencies(generate-coverage testrunner)
 		message(STATUS "Python found; generate-coverage target enabled")
 	else ()
 		message(STATUS "Python not found; coverage report disabled")

src/cmake/CodeCoverage.cmake

@@ -140,7 +140,7 @@ include(CMakeParseArguments)
 option(CODE_COVERAGE_VERBOSE "Verbose information" FALSE)
 
 get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG OR CMAKE_BUILD_TYPE STREQUAL "Coverage")
 
 # Check prereqs
 find_program( GCOV_PATH gcov )

src/scripts/testsuite.py

@@ -24,6 +24,13 @@
     BUILD_DIR = arg
     sys.argv.remove(arg)
 
+HOME_DIR = "."
+with open(f"{BUILD_DIR}/CMakeCache.txt", "r") as cache:
+  for line in cache.readlines():
+    if line.startswith("CMAKE_HOME_DIRECTORY:INTERNAL"):
+      _, HOME_DIR = line.strip().split("=")
+      break
+
 if os.getenv('REQUESTS_DEBUG'):
   logging.basicConfig()
   logging.getLogger().setLevel(logging.DEBUG)
@@ -62,7 +69,7 @@ def setUp(self, env=None, harness='testrunner'):
     self.files_to_remove = []
     for file_to_copy in self.files_to_copy[harness]:
       base = os.path.basename(file_to_copy)
-      shutil.copyfile(file_to_copy, base)
+      shutil.copyfile(f'{HOME_DIR}/{file_to_copy}', base)
       self.files_to_remove.append(base)
 
     open('htpasswd', 'w').close()
@@ -1041,14 +1048,14 @@ def run_test(self, contents):
 
   @staticmethod
   def wrap(name):
-    with open(os.path.join("fuzz", "regression", name), "rb") as f:
+    with open(os.path.join(HOME_DIR, "fuzz", "regression", name), "rb") as f:
       contents = str(f.read(), "latin-1")
     def run_test_wrapped(self):
       return self.run_test(contents)
     return run_test_wrapped
 
 def only_request_fuzzer_regression():
-  for path in os.listdir("fuzz/regression"):
+  for path in os.listdir(f"{HOME_DIR}/fuzz/regression"):
     if not "request_fuzzer" in path:
       continue
     if path.startswith(("clusterfuzz-", "crash-")):