Commit e6073a78 authored by Wez's avatar Wez Committed by Commit Bot

[fuchsia] Simplify specification of required host tools.

Fuchsia tests are always run by a host system matching the target's CPU
(which may differ from the _build_ host CPU), so simplify the |data|
dependencies of generated runner scripts to use |target_cpu|, allowing
there to be a single list of required tools.

Bug: 1024086
Change-Id: I6346b237f8b87646634d5691f1ceeedc79140639
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152445Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Auto-Submit: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760995}
parent 17912578
...@@ -113,24 +113,21 @@ template("fuchsia_package_runner") { ...@@ -113,24 +113,21 @@ template("fuchsia_package_runner") {
data += [ "${aemu_root}/" ] data += [ "${aemu_root}/" ]
} }
if (host_os == "linux" && host_cpu == "x64" && target_cpu == "arm64") { # Ensure that the host tools required by runner scripts are in runtime deps.
data += [ # Note that these must be provided for the test host architecture, which
# Host tools for arm64 test bots. # currently always matches the |target_cpu|, rather than for the build host
"//third_party/fuchsia-sdk/sdk/tools/arm64/fvm", # architecture.
"//third_party/fuchsia-sdk/sdk/tools/arm64/merkleroot", data += [
"//third_party/fuchsia-sdk/sdk/tools/arm64/pm", "//third_party/fuchsia-sdk/sdk/tools/${target_cpu}/fvm",
"//third_party/fuchsia-sdk/sdk/tools/arm64/symbolize", "//third_party/fuchsia-sdk/sdk/tools/${target_cpu}/merkleroot",
"//third_party/fuchsia-sdk/sdk/tools/arm64/zbi", "//third_party/fuchsia-sdk/sdk/tools/${target_cpu}/pm",
"${qemu_arm64_root}/", "//third_party/fuchsia-sdk/sdk/tools/${target_cpu}/symbolize",
] "//third_party/fuchsia-sdk/sdk/tools/${target_cpu}/zbi",
]
if (target_cpu == "arm64") {
data += [ "${qemu_arm64_root}/" ]
} else { } else {
data += [ data += [
# Host tools for x64 test bots.
"//third_party/fuchsia-sdk/sdk/tools/x64/fvm",
"//third_party/fuchsia-sdk/sdk/tools/x64/merkleroot",
"//third_party/fuchsia-sdk/sdk/tools/x64/pm",
"//third_party/fuchsia-sdk/sdk/tools/x64/symbolize",
"//third_party/fuchsia-sdk/sdk/tools/x64/zbi",
"${qemu_root}/", "${qemu_root}/",
"//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer", "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment