From 182a20f835e909ec2bb2fc1237c1bc5283843cfd Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 13 Dec 2023 11:00:41 +0000 Subject: [PATCH] Fix failing tests in pkg:native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rev the import and fix the tests in pkg:dartdev to reflect recent refactorings. Cq-Include-Trybots: luci.dart.try:pkg-linux-release-try Change-Id: If3df36284b1a324cbdc94b709008891b1f3d756f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/341221 Reviewed-by: Daco Harkes Commit-Queue: Moritz Sümmermann --- DEPS | 2 +- pkg/dartdev/test/native_assets/helpers.dart | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 4fe332086f7..79c6b718718 100644 --- a/DEPS +++ b/DEPS @@ -163,7 +163,7 @@ vars = { "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", "mime_rev": "56359b0c72e1a9a2e2b20ee5a34bacc18e113897", "mockito_rev": "57a7c820ffae61e3df0dbc279ad98b92751175f0", - "native_rev": "5aeab2915167fd24ccb1241c07516b388fda2b9b", # https://github.com/dart-lang/native/issues/855 + "native_rev": "b668ca94f551fcebdeb3ce9f822170facced55ae", "package_config_rev": "33dd24659147bd7ed2fa87aeacc52d199be766b4", "path_rev": "115ea2a4084881e7c76089a37abc01a067dfa6e3", "pool_rev": "3c1bd422da311d95b65a04a5f28de2c0e8193692", diff --git a/pkg/dartdev/test/native_assets/helpers.dart b/pkg/dartdev/test/native_assets/helpers.dart index f00739f48fd..e7b79b08ffe 100644 --- a/pkg/dartdev/test/native_assets/helpers.dart +++ b/pkg/dartdev/test/native_assets/helpers.dart @@ -74,10 +74,15 @@ Future copyTestProjects(Uri copyTargetUri, Logger logger) async { final manifest = [ for (final path in manifestYaml.contents as YamlList) Uri(path: path) ]; - final filesToCopy = - manifest.where((e) => e.pathSegments.last != 'pubspec.yaml').toList(); - final filesToModify = - manifest.where((e) => e.pathSegments.last == 'pubspec.yaml').toList(); + final filesToCopy = manifest + .where((e) => !(e.pathSegments.last.startsWith('pubspec') && + e.pathSegments.last.endsWith('.yaml'))) + .toList(); + final filesToModify = manifest + .where((e) => + e.pathSegments.last.startsWith('pubspec') && + e.pathSegments.last.endsWith('.yaml')) + .toList(); for (final pathToCopy in filesToCopy) { final sourceFile = File.fromUri(testProjectsUri.resolveUri(pathToCopy));