fix wd_test

Author: anonrig

.bazelrc

@@ -421,16 +421,17 @@ build:coverage --test_env=BAZEL_USE_LLVM_NATIVE_COVERAGE=1
 # GCOV is used by rules_cc to merge raw profile data (.profraw) into indexed profile data (.profdata)
 build:coverage --action_env=GCOV=llvm-profdata
 build:coverage --test_env=GCOV=llvm-profdata
-# COVERAGE_GCOV_PATH is passed through from the environment. Users must set this to the absolute path
-# of llvm-profdata (used by collect_cc_coverage.sh for merging .profraw files).
-# Example: export COVERAGE_GCOV_PATH=$(which llvm-profdata)
-build:coverage --action_env=COVERAGE_GCOV_PATH
-build:coverage --test_env=COVERAGE_GCOV_PATH
+# COVERAGE_GCOV_PATH is used by collect_cc_coverage.sh for merging .profraw files.
+build:coverage --action_env=COVERAGE_GCOV_PATH=/usr/bin/llvm-profdata
+build:coverage --test_env=COVERAGE_GCOV_PATH=/usr/bin/llvm-profdata
 # BAZEL_LLVM_COV is used by rules_cc to generate coverage reports from profile data
 build:coverage --action_env=BAZEL_LLVM_COV=llvm-cov
 build:coverage --test_env=BAZEL_LLVM_COV=llvm-cov
 # LLVM_COV is used by collect_cc_coverage.sh for generating LCOV output
 build:coverage --test_env=LLVM_COV=llvm-cov
+# GENERATE_LLVM_LCOV=1 tells collect_cc_coverage.sh to use llvm-cov export to generate LCOV format
+# instead of just outputting raw profdata. LLVM_COV specifies the llvm-cov binary to use.
+build:coverage --test_env=GENERATE_LLVM_LCOV=1
 build:coverage --experimental_use_llvm_covmap
 build:coverage --experimental_generate_llvm_lcov
 # Ensure that we fetch coverage data from remote cache

build/wd_test.bzl

@@ -242,8 +242,6 @@ def _wd_test_impl(ctx):
         ctx,
         source_attributes = ["src", "data"],
         dependency_attributes = ["workerd", "sidecar", "sidecar_supervisor"],
-        # Include all file types that might contain testable code
-        extensions = ["cc", "c++", "cpp", "cxx", "c", "h", "hh", "hpp", "hxx", "inc", "js", "ts", "mjs", "wd-test", "capnp"],
     )
     environment = dict(ctx.attr.env)
     if ctx.attr.python_snapshot_test:
@@ -282,11 +280,14 @@ _wd_test = rule(
         ),
         # Source file
         "src": attr.label(allow_single_file = True),
-        # The workerd executable is used to run all tests
+        # The workerd executable is used to run all tests.
+        # Using cfg = "target" instead of "exec" ensures workerd is built with coverage
+        # instrumentation when running `bazel coverage`. With cfg = "exec", the binary
+        # would be built in exec configuration which doesn't include coverage flags.
         "workerd": attr.label(
             allow_single_file = True,
             executable = True,
-            cfg = "exec",
+            cfg = "target",
             default = "//src/workerd/server:workerd_cross",
         ),
         # A list of files that this test requires to be present in order to run.