Skip to content

Commit 296df33

Browse files
[fuchsia] Uprev test-scripts with FUCHSIA_READELF env (#166929)
Copied from flutter/flutter#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]. <!-- Links --> [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
1 parent c251366 commit 296df33

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ vars = {
211211
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
212212
# will be used altogether with fuchsia-sdk to setup the build / test
213213
# environment.
214-
'fuchsia_test_scripts_version': 'FZdRtNwH7jmADecj60ClOK69AHHnfTvvuwKLUgY0_AoC',
214+
'fuchsia_test_scripts_version': 'mApUsju36efRytN4WFdopPYMfYgAI8ODzTmYq3zNEqsC',
215215

216216
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
217217
# used altogether with fuchsia-sdk to generate gn based build rules.

engine/src/flutter/tools/fuchsia/with_envs.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def Main():
1818
Executes the test-scripts with required environment variables. It acts like
1919
/usr/bin/env, but provides some extra functionality to dynamically set up
2020
the environment variables.
21-
"""
21+
"""
2222
# Ensures the signals can be correctly forwarded to the subprocesses.
2323
catch_sigterm()
2424

@@ -32,6 +32,9 @@ def Main():
3232
os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(
3333
os.environ['SRC_ROOT'], 'flutter/tools/fuchsia/gn-sdk/src'
3434
)
35+
os.environ['FUCHSIA_READELF'] = os.path.join(
36+
os.environ['SRC_ROOT'], 'flutter/buildtools/linux-x64/clang/bin/llvm-readelf'
37+
)
3538

3639
if os.getenv('DOWNLOAD_FUCHSIA_SDK') == 'True':
3740
sdk_path = os.environ['FUCHSIA_SDK_PATH']

0 commit comments

Comments
 (0)