From 0c61ee34659aeea276862fb2354d1327ff617640 Mon Sep 17 00:00:00 2001 From: Nolan Scobie Date: Thu, 7 Dec 2023 15:09:17 -0500 Subject: Allow any exception to pass SkQP's SkSL error tests CTS tests must remain valid for a given API level, but we want to be able to change error messages as we see fit, and the specific messages are not part of the API contract. Bug: b/308075521 Change-Id: I4fc3cdd6a2955ec16dcdf4f72eff534321a0dddc Test: CtsSkQPTestCases built from base UDC tested against recent UDC Reviewed-on: https://skia-review.googlesource.com/c/skia/+/787082 Commit-Queue: John Stiles Auto-Submit: Nolan Scobie Reviewed-by: John Stiles --- .../src/main/java/org/skia/skqp/SkQPRunner.java | 31 +--------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java index c94d932686..8a322ba647 100644 --- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java +++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java @@ -182,36 +182,7 @@ public class SkQPRunner extends Runner implements Filterable { name(index))); return false; } - catch (Exception ex) { - // Verify that RuntimeShader actually emitted the expected error messages. - // The list of expectations isn't necessarily exhaustive, though. - String errorText = ex.getMessage(); - String[] block = shaderText.split(Pattern.quote("*%%*")); - if (block.length >= 3) { - // We only intend to support a single /%**%/ section. - // Because we are splitting on *%%*, expectations should always be in block[1]. - String[] expectations = block[1].split("\n"); - for (String expectation : expectations) { - if (expectation.length() == 0) { - continue; - } - int errIndex = errorText.indexOf(expectation); - // If this error wasn't reported, trigger an error. - if (errIndex < 0) { - String failMessage = String.format("Expected error '%s', got '%s'", - expectation, ex.getMessage()); - SkQPRunner.Fail(desc(index), notifier, failMessage); - Log.w(TAG, String.format("[FAIL] '%s': %s", name(index), failMessage)); - return false; - } - // We found the error that we expected to have. Remove that error from our - // text, and everything preceding it as well. This ensures that we don't - // match the same error twice, and that errors are reported in the order - // we expect. - errorText = errorText.substring(errIndex + expectation.length()); - } - } - } + catch (Exception ex) { } // Assume any exception is an expected SkSL error. return true; } } -- cgit v1.2.3