From 296df33be866d0cd8387524e288d9b280e725795 Mon Sep 17 00:00:00 2001 From: "zijiehe@" <68449066+zijiehe-google-com@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:38:02 -0700 Subject: [PATCH] [fuchsia] Uprev test-scripts with FUCHSIA_READELF env (#166929) Copied from https://github.com/flutter/flutter/pull/166901 with the essential fix to make it work. Bug: b/407890258, b/338009514 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- DEPS | 2 +- engine/src/flutter/tools/fuchsia/with_envs.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index c960c7276b1..ae51fadc70d 100644 --- a/DEPS +++ b/DEPS @@ -211,7 +211,7 @@ vars = { # The version / instance id of the cipd:chromium/fuchsia/test-scripts which # will be used altogether with fuchsia-sdk to setup the build / test # environment. - 'fuchsia_test_scripts_version': 'FZdRtNwH7jmADecj60ClOK69AHHnfTvvuwKLUgY0_AoC', + 'fuchsia_test_scripts_version': 'mApUsju36efRytN4WFdopPYMfYgAI8ODzTmYq3zNEqsC', # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be # used altogether with fuchsia-sdk to generate gn based build rules. diff --git a/engine/src/flutter/tools/fuchsia/with_envs.py b/engine/src/flutter/tools/fuchsia/with_envs.py index bb23636a419..46743a65cfa 100644 --- a/engine/src/flutter/tools/fuchsia/with_envs.py +++ b/engine/src/flutter/tools/fuchsia/with_envs.py @@ -18,7 +18,7 @@ def Main(): Executes the test-scripts with required environment variables. It acts like /usr/bin/env, but provides some extra functionality to dynamically set up the environment variables. - """ + """ # Ensures the signals can be correctly forwarded to the subprocesses. catch_sigterm() @@ -32,6 +32,9 @@ def Main(): os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join( os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src' ) + os.environ['FUCHSIA_READELF'] = os.path.join( + os.environ['SRC_ROOT'], 'flutter/buildtools/linux-x64/clang/bin/llvm-readelf' + ) if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True': sdk_path = os.environ['FUCHSIA_SDK_PATH']