From 5ede6d466cedde63a8477c5b6ecd9beef3e44ff2 Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Wed, 25 Sep 2024 20:45:11 +0000 Subject: [PATCH] [deps] Roll dart-lang/native to new version We rename the Dart CI specific environment variables we use for testing dart-lang/native code on Dart CI to make it clear they are for testing only. Change-Id: Idb7c016df5b6fd3aee7a2952be06752a8343f02e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/386804 Commit-Queue: Martin Kustermann Reviewed-by: Daco Harkes --- DEPS | 2 +- pkg/dartdev/test/native_assets/test_environment_test.dart | 3 ++- pkg/test_runner/lib/src/configuration.dart | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index c3aa8fd29bc..f23cc254536 100644 --- a/DEPS +++ b/DEPS @@ -163,7 +163,7 @@ vars = { "matcher_rev": "d6d573d0f8d65b36550ce62aad3ce6b5e987b642", "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", "mockito_rev": "b66be81e38e1ac76d12ee2fe4f93757a40bbb7ba", - "native_rev": "82c0aacd06e61efd75e61ed85a894cc139a3a3aa", # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental. + "native_rev": "67a258ce5a365f13180978637be0f10996cced43", # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental. "package_config_rev": "76934c2ca25922ec72909bbff7dfbddaf0d02bd9", "path_rev": "e969f42ed112dd702a9453beb9df6c12ae2d3805", "pool_rev": "924fb04353cec915d927f9f1aed88e2eda92b98a", diff --git a/pkg/dartdev/test/native_assets/test_environment_test.dart b/pkg/dartdev/test/native_assets/test_environment_test.dart index c2441a81675..75af26819d8 100644 --- a/pkg/dartdev/test/native_assets/test_environment_test.dart +++ b/pkg/dartdev/test/native_assets/test_environment_test.dart @@ -13,7 +13,8 @@ void main() async { test('test environment', () async { printOnFailure(Platform.environment.toString()); - String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase(); + String unparseKey(String key) => + 'DART_HOOK_TESTING_${key.replaceAll('.', '__').toUpperCase()}'; final arKey = unparseKey(CCompilerConfigImpl.arConfigKeyFull); final ccKey = unparseKey(CCompilerConfigImpl.ccConfigKeyFull); diff --git a/pkg/test_runner/lib/src/configuration.dart b/pkg/test_runner/lib/src/configuration.dart index c798032f108..c98f8dd5090 100644 --- a/pkg/test_runner/lib/src/configuration.dart +++ b/pkg/test_runner/lib/src/configuration.dart @@ -284,7 +284,8 @@ class TestConfiguration { }(); late final Map nativeCompilerEnvironmentVariables = () { - String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase(); + String unparseKey(String key) => + 'DART_HOOK_TESTING_${key.replaceAll('.', '__').toUpperCase()}'; final arKey = unparseKey(CCompilerConfigImpl.arConfigKeyFull); final ccKey = unparseKey(CCompilerConfigImpl.ccConfigKeyFull); final ldKey = unparseKey(CCompilerConfigImpl.ldConfigKeyFull);