tools: More CTS coverage fixes
* Use common_compile_options(turbo-cov) to fix RTTI linker errors on macOS + debug builds.
* Delete the .profraw files after they've been consumed.
* Include the test-case parameters in the coverage information
Change-Id: I02c6f408ed6e65c6f7e9eb1b4cd8443e4cfa7939
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/117882
Kokoro: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
diff --git a/tools/src/cmd/run-cts/main.go b/tools/src/cmd/run-cts/main.go
index 7ea7f37..d0d6419 100644
--- a/tools/src/cmd/run-cts/main.go
+++ b/tools/src/cmd/run-cts/main.go
@@ -804,6 +804,7 @@
if resp.CoverageData != "" {
coverage, covErr := r.covEnv.Import(resp.CoverageData)
+ os.Remove(resp.CoverageData)
if covErr != nil {
if res.message != "" {
res.message += "\n"
@@ -1500,5 +1501,8 @@
s = e + 1
}
}
+ if end := testcase[s:]; end != "" {
+ out = append(out, end)
+ }
return out
}
diff --git a/tools/src/cmd/turbo-cov/CMakeLists.txt b/tools/src/cmd/turbo-cov/CMakeLists.txt
index f1981b9..264fc40 100644
--- a/tools/src/cmd/turbo-cov/CMakeLists.txt
+++ b/tools/src/cmd/turbo-cov/CMakeLists.txt
@@ -34,6 +34,8 @@
LLVMProfileData
LLVMCoverage
)
+
+ common_compile_options(turbo-cov)
else (LLVM_SOURCE_DIR)
message("not building turbo-cov as LLVM_SOURCE_DIR is undefined")
endif (LLVM_SOURCE_DIR)
