From 2e0ce9c1e0756d3f7aca26775c6cb176eaa569be Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 24 Oct 2024 18:39:03 +0000 Subject: [PATCH 1/2] [web] Do not copy invalid images in the Skia test image collection A recent Skia commit added a test image that is used to check handling of invalid input. This is causing some web tests to fail because Firefox rejects the image. (see https://skia.googlesource.com/skia.git/+/ff59ce65022d71f883b7e3be146bbd32facadaf8) --- lib/web_ui/dev/steps/copy_artifacts_step.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/web_ui/dev/steps/copy_artifacts_step.dart b/lib/web_ui/dev/steps/copy_artifacts_step.dart index 7c7293bbd5fc6..da6fd754ef38b 100644 --- a/lib/web_ui/dev/steps/copy_artifacts_step.dart +++ b/lib/web_ui/dev/steps/copy_artifacts_step.dart @@ -137,6 +137,10 @@ class CopyArtifactsStep implements PipelineStep { )); for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType()) { + // Skip files that are used by Skia to test handling of invalid input. + if (pathlib.basename(imageFile.path).contains("invalid")) { + continue; + } final io.File destination = io.File(pathlib.join( environment.webTestsArtifactsDir.path, 'test_images', From 55fb8c9ab15ac59ba40022c081bfb70616c59c3d Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 24 Oct 2024 20:41:02 +0000 Subject: [PATCH 2/2] analyzer --- lib/web_ui/dev/steps/copy_artifacts_step.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web_ui/dev/steps/copy_artifacts_step.dart b/lib/web_ui/dev/steps/copy_artifacts_step.dart index da6fd754ef38b..d74134f681f0d 100644 --- a/lib/web_ui/dev/steps/copy_artifacts_step.dart +++ b/lib/web_ui/dev/steps/copy_artifacts_step.dart @@ -138,7 +138,7 @@ class CopyArtifactsStep implements PipelineStep { for (final io.File imageFile in testImagesDir.listSync(recursive: true).whereType()) { // Skip files that are used by Skia to test handling of invalid input. - if (pathlib.basename(imageFile.path).contains("invalid")) { + if (pathlib.basename(imageFile.path).contains('invalid')) { continue; } final io.File destination = io.File(pathlib.join(