build-and-test-all: We no longer build from a distdir w/ meson

diff --git a/.github/scripts/normalize_paths_in_coverage.py b/.github/scripts/normalize_paths_in_coverage.py
index 802b19ff1e6ff2c6f82cfafdba412599d3128190..78475acc6e934ecbf256b4c40d54c3ab84a6609e 100755 (executable)
--- a/.github/scripts/normalize_paths_in_coverage.py
+++ b/.github/scripts/normalize_paths_in_coverage.py
@@ -8,6 +8,7 @@ if __name__ == '__main__':
     version = sys.argv[2]
     inputFile = sys.argv[3]
     outputFile = sys.argv[4]
+    fromDistDir = sys.argv[5]
     with open(inputFile, mode='r') as inputFilePtr:
         with open(outputFile, mode='w') as outputFilePtr:
             for line in inputFilePtr:
@@ -38,7 +39,7 @@ if __name__ == '__main__':
                     distPath = os.path.join(repositoryRoot, 'pdns', 'dnsdistdist', f'dnsdist-{version}')
                     relativeToDist = os.path.relpath(target, distPath)
                     target = os.path.join('pdns', 'dnsdistdist', relativeToDist)
-                else:
+                elif fromDistDir == '1':
                     print(f'Ignoring {target} that we could not map to a distdir', file=sys.stderr)
                     continue
 

diff --git a/tasks.py b/tasks.py
index 6347e91050853d75632b20054a5454179039233a..f37ee069849039875f93b1a800e7011d01dc71a3 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -236,7 +236,7 @@ def generate_coverage_info(c, binary, outputDir):
         version = os.getenv('BUILDER_VERSION')
         c.run(f'llvm-profdata-{clang_version} merge -sparse -o {outputDir}/temp.profdata /tmp/code-*.profraw')
         c.run(f'llvm-cov-{clang_version} export --format=lcov --ignore-filename-regex=\'^/usr/\' -instr-profile={outputDir}/temp.profdata -object {binary} > {outputDir}/coverage.lcov')
-        c.run(f'{outputDir}/.github/scripts/normalize_paths_in_coverage.py {outputDir} {version} {outputDir}/coverage.lcov {outputDir}/normalized_coverage.lcov')
+        c.run(f'{outputDir}/.github/scripts/normalize_paths_in_coverage.py {outputDir} {version} {outputDir}/coverage.lcov {outputDir}/normalized_coverage.lcov 0')
         c.run(f'mv {outputDir}/normalized_coverage.lcov {outputDir}/coverage.lcov')
 
 def setup_authbind(c):