build: fix bad coverage report for test-compat

Author: thislight

build.zig

@@ -92,13 +92,15 @@ pub fn build(b: *std.Build) void {
             .root_source_file = b.path("src/rewriter.zig"),
             .target = target,
             .optimize = optimize,
+            .strip = if (kcov != null) false else null,
+            .single_threaded = true,
         });
         rewriter.root_module.addImport("zigpak", core);
 
         stepCheck.dependOn(&rewriter.step);
 
         if (kcov) |args| {
-            const COMPAT_RUN_CMD = "ZIGPAK_REWRITER=$1 KCOV=kcov KCOV_ARGS=\"--include-path=$2 $3\" KCOV_REPORT=$4 bun test";
+            const COMPAT_RUN_CMD = "ZIGPAK_REWRITER=$1 KCOV=kcov KCOV_ARGS=\"--include-path=$2 --skip-solibs $3\" KCOV_REPORT=$4 bun test";
 
             const kcovArgs = std.mem.join(
                 b.allocator,
@@ -136,7 +138,8 @@ pub fn build(b: *std.Build) void {
             run.addArg(includeArg);
             run.addArgs(args);
             run.addArtifactArg(tests);
-            run.enableTestRunnerMode();
+            // run.enableTestRunnerMode();
+            // Kcov does not respect the test runner protocol
             stepTest.dependOn(&run.step);
         } else {
             const run = b.addRunArtifact(tests);

tests/kcov.ts

@@ -2,15 +2,17 @@ import { afterAll } from "bun:test";
 import { mkdir, rm } from "node:fs/promises";
 
 export const KCOV = process.env["KCOV"];
-export const KCOV_ARGS = process.env["KCOV_ARGS"] ?? "";
+export const KCOV_ARGS = (process.env["KCOV_ARGS"] ?? "").split(" ").filter(x => x);
 const KCOV_REPORT = process.env["KCOV_REPORT"] ?? "./zig-out/cov";
 
 export const coverages = [] as string[];
 
 if (KCOV) {
+  console.debug(KCOV, KCOV_ARGS, KCOV_REPORT)
+
   afterAll(async () => {
     await mkdir(KCOV_REPORT, { recursive: true });
-    await Bun.$`${KCOV} ${KCOV_ARGS} --merge ${KCOV_REPORT.split(" ")} ${coverages}`;
+    await Bun.$`${KCOV} ${KCOV_ARGS} --merge ${KCOV_REPORT} ${coverages}`;
     await Promise.all(coverages.map((x) => rm(x, { recursive: true })));
   });
 }

tests/tools.ts

@@ -6,16 +6,18 @@ import { tmpdir } from "node:os";
 const REWRITER =
   process.env["ZIGPAK_REWRITER"] || "./zig-out/bin/zigpak-rewriter";
 
-function runRewriter(data: Uint8Array | ArrayBuffer | Buffer) {
-  if (KCOV) {
-    const collectPath = mkdtempSync(join(tmpdir(), "zigpak-"));
-    coverages.push(collectPath);
-    return Bun.$`${KCOV} ${KCOV_ARGS} --collect-only ${collectPath} ${REWRITER} < ${data}`;
-  } else {
-    return Bun.$`${REWRITER} < ${data}`;
-  }
+function runRewriterKcov(data: Uint8Array | ArrayBuffer | Buffer) {
+  const collectPath = mkdtempSync(join(tmpdir(), "zigpak-"));
+  coverages.push(collectPath);
+  return Bun.$`${KCOV} ${KCOV_ARGS} --collect-only ${collectPath} ${REWRITER} < ${data}`;
+}
+
+function runRewriterRegular(data: Uint8Array | ArrayBuffer | Buffer) {
+  return Bun.$`${REWRITER} < ${data}`;
 }
 
+const runRewriter = KCOV ? runRewriterKcov : runRewriterRegular;
+
 export async function rewriter(data: Uint8Array | ArrayBuffer | Buffer) {
   const { stdout, stderr, exitCode } = await runRewriter(data)
     .quiet()