From 08f94e900426ea7fcfa4c6e04ee083d8c648ce7c Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Thu, 12 May 2022 10:08:46 +0000 Subject: [PATCH] tools/CTS: merge [Slow] + [Pass] -> [Slow] Instead of Failure. If we have duplicate results (same query, same tags), but with different results, then we have to merge them. Previously we'd merge Pass and Slow as Failure, which was just odd. Fix this so the combined result is Slow. Bug: dawn:1342 Change-Id: If9b035bb3c1e59b7a93a5c8b194f854405e656d6 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/89960 Reviewed-by: Corentin Wallez Kokoro: Kokoro Commit-Queue: Corentin Wallez Auto-Submit: Ben Clayton --- tools/src/cmd/cts/common/results.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/src/cmd/cts/common/results.go b/tools/src/cmd/cts/common/results.go index 095106a753..e01511b3cb 100644 --- a/tools/src/cmd/cts/common/results.go +++ b/tools/src/cmd/cts/common/results.go @@ -355,6 +355,10 @@ func CleanTags(cfg Config, results *result.List) { return result.Crash case s.Contains(result.Abort): return result.Abort + case s.Contains(result.Failure): + return result.Failure + case s.Contains(result.Slow): + return result.Slow } return result.Failure })