Skip to content

GitLab

T
tangled
Commit 501fec5e authored by Yuke Liao's avatar Yuke Liao Committed by Chromium LUCI CQ
Browse files
Options

Revert "Lacros: create lacros tast test targets" 

This reverts commit e2f3b551.

Reason for revert:

Breaks local user flow when entering chrome_sdk

ERROR at //build/config/chromeos/rules.gni:180:11: Undefined identifier.
          _symlink_targets[2],
          ^-----------------
See //chromeos/BUILD.gn:239:3: whence it was called.
  generate_runner_script("cros_test_wrapper") {
  ^--------------------------------------------
See //BUILD.gn:442:7: which caused the file to be included.
      "//chromeos:chromeos_unittests",

Original change's description:
> Lacros: create lacros tast test targets
>
> This CL creates gn targets for lacros tast tests, and the main
> motivation is to run lacros tast tests on Chromium CI.
>
> Bug: 1158590
> Change-Id: I783779c3386a39743b8227367189b0b87832b9dc
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2606188
> Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Cr-Commit-Position: refs/heads/master@{#844127}

TBR=dpranke@google.com,liaoyuke@chromium.org,bpastene@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I1e51bf2e6aa97bfc40beba7d2693b68361cab2bc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1158590
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2633782Reviewed-by: default avatarYuke Liao <liaoyuke@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844180}
parent 3c526c9d
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 228 deletions
build/config/chromeos/rules.gni
View file @ 501fec5e
...@@ -8,90 +8,56 @@ import("//build/config/chromeos/ui_mode.gni") ...@@ -8,90 +8,56 @@ import("//build/config/chromeos/ui_mode.gni")
import("//build/config/gclient_args.gni") import("//build/config/gclient_args.gni")
import("//build/config/python.gni") import("//build/config/python.gni")
assert(is_chromeos_ash || is_chromeos_lacros) assert(is_chromeos_ash)
# Determine the real paths for various items in the SDK, which may be used # Determine the real paths for various items in the SDK, which may be used
# in the 'generate_runner_script' template below. We do so outside the template # in the 'generate_runner_script' template below. We do so outside the template
# to confine exec_script to a single invocation. # to confine exec_script to a single invocation.
cros_is_vm = false
if (is_chromeos_device && cros_sdk_version != "") { if (is_chromeos_device && cros_sdk_version != "") {
# Ideally these should be maps, however, gn doesn't support map, so using a _cache_path_prefix =
# list of list to simulate a map: "//build/cros_cache/chrome-sdk/symlinks/${cros_board}+${cros_sdk_version}"
# [key1, [value1, value2, ...]], [key2, [value1, value2, ...]], where
# the keys are boards and values are symlinks or symlink targets, and the
# mapping shouldn't be used for anything else.
#
# A sample usage is:
# foreach(m, _symlink_targets_map) {
# if(m[0] == target_key) {
# target_value = m[1]
# }
# }
#
_symlink_map = []
_symlink_targets_map = []
_boards = []
if (cros_boards != "") { foreach(b, string_split(cros_boards_with_qemu_images, ":")) {
_boards += string_split(cros_boards, ":") if (cros_board == b) {
} cros_is_vm = true
if (cros_boards_with_qemu_images != "") {
_boards += string_split(cros_boards_with_qemu_images, ":")
}
foreach(b, _boards) {
_cache_path_prefix =
"//build/cros_cache/chrome-sdk/symlinks/${b}+${cros_sdk_version}"
cros_is_vm = false
foreach(b1, string_split(cros_boards_with_qemu_images, ":")) {
if (b == b1) {
cros_is_vm = true
}
} }
_symlinks = []
_symlinks = [
# Tast harness & test data.
rebase_path("${_cache_path_prefix}+chromeos-base/tast-cmd"),
rebase_path("${_cache_path_prefix}+chromeos-base/tast-remote-tests-cros"),
# Binutils (and other toolchain tools) used to deploy Chrome to the device.
rebase_path(
"${_cache_path_prefix}+environment_chromeos-base_chromeos-chrome.tar.xz"),
rebase_path("${_cache_path_prefix}+target_toolchain"),
]
if (cros_is_vm) {
# VM-related tools.
_symlinks += [
rebase_path("${_cache_path_prefix}+sys-firmware/seabios"),
rebase_path("${_cache_path_prefix}+chromiumos_qemu_image.tar.xz"),
rebase_path("${_cache_path_prefix}+app-emulation/qemu"),
]
}
_symlink_map += [ [
b,
_symlinks,
] ]
} }
_all_symlinks = [] _symlinks = [
foreach(m, _symlink_map) { # Tast harness & test data.
_all_symlinks += m[1] rebase_path("${_cache_path_prefix}+chromeos-base/tast-cmd"),
rebase_path("${_cache_path_prefix}+chromeos-base/tast-remote-tests-cros"),
# Binutils (and other toolchain tools) used to deploy Chrome to the device.
rebase_path(
"${_cache_path_prefix}+environment_chromeos-base_chromeos-chrome.tar.xz"),
rebase_path("${_cache_path_prefix}+target_toolchain"),
]
if (cros_is_vm) {
# VM-related tools.
_symlinks += [
rebase_path("${_cache_path_prefix}+sys-firmware/seabios"),
rebase_path("${_cache_path_prefix}+chromiumos_qemu_image.tar.xz"),
rebase_path("${_cache_path_prefix}+app-emulation/qemu"),
]
} }
_all_symlink_targets = _symlink_targets =
exec_script("//build/get_symlink_targets.py", _all_symlinks, "list lines") exec_script("//build/get_symlink_targets.py", _symlinks, "list lines")
_index = 0 tast_sdk_items = [
foreach(m, _symlink_map) { _symlink_targets[0],
_symlink_targets = [] _symlink_targets[1],
foreach(_, m[1]) { ]
_symlink_targets += [ _all_symlink_targets[_index] ] toolchain_sdk_items = [
_index += 1 _symlink_targets[2],
} _symlink_targets[3],
]
_symlink_targets_map += [ [ if (cros_is_vm) {
m[0], vm_sdk_items = [
_symlink_targets, _symlink_targets[4],
] ] _symlink_targets[5],
_symlink_targets[6],
]
} }
} }
...@@ -110,86 +76,28 @@ if (is_chromeos_device && cros_sdk_version != "") { ...@@ -110,86 +76,28 @@ if (is_chromeos_device && cros_sdk_version != "") {
# build dir to the VM after launching it. # build dir to the VM after launching it.
# runtime_deps_file: Path to file listing runtime deps for the test. If set, # runtime_deps_file: Path to file listing runtime deps for the test. If set,
# all files listed will be copied to the VM before testing. # all files listed will be copied to the VM before testing.
# override_board: "cros_board" variable was used to decide both the toolchain
# to build Chrome and the DUTs to test the binary, however, with the
# introduction of Lacros, this is not true anymore: a Lacros chrome can be
# built by an amd64-generic toolchain, but tested on eve devices, and to
# accommondate the use case, this variable is introduced to allow
# overriding the board to test the built binary.
# tast_vars: A list of "key=value" runtime variable pairs to pass to invoke
# the Tast tests. For more details, please see:
# https://chromium.googlesource.com/chromiumos/platform/tast/+/HEAD/docs/writing_tests.md#Runtime-variables
template("generate_runner_script") { template("generate_runner_script") {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"override_board",
"deploy_chrome", "deploy_chrome",
"generated_script", "generated_script",
"runtime_deps_file", "runtime_deps_file",
"tast_attr_expr", "tast_attr_expr",
"tast_tests", "tast_tests",
"tast_vars",
"testonly", "testonly",
"test_exe", "test_exe",
]) ])
if (!defined(deploy_chrome)) {
if (defined(override_board)) { deploy_chrome = false
cros_board = override_board
} }
if (is_chromeos_device && cros_sdk_version != "") { assert(defined(generated_script),
assert(defined(generated_script), "Must specify where to place generated test launcher script via " +
"Must specify where to place generated test launcher script via " + "'generated_script'")
"'generated_script'") is_tast = defined(tast_attr_expr) || defined(tast_tests)
is_tast = defined(tast_attr_expr) || defined(tast_tests) assert(!(is_tast && defined(test_exe)),
assert(!(is_tast && defined(test_exe)), "Tast tests are invoked from binaries shipped with the VM image. " +
"Tast tests are invoked from binaries shipped with the VM image. " + "There should be no locally built binary needed.")
"There should be no locally built binary needed.")
assert(is_tast || !defined(tast_vars),
"tast_vars is only support for Tast tests")
# Determine the real paths for various items in the SDK, which may be used
# in the 'generate_runner_script' template below.
cros_is_vm = false
foreach(b, string_split(cros_boards_with_qemu_images, ":")) {
if (cros_board == b) {
cros_is_vm = true
}
}
if (!defined(deploy_chrome)) {
deploy_chrome = false
}
if (is_tast || cros_is_vm || deploy_chrome) {
foreach(m, _symlink_targets_map) {
if (cros_board == m[0]) {
_symlink_targets = []
_symlink_targets = m[1]
}
}
if (is_tast) {
_tast_sdk_items = [
_symlink_targets[0],
_symlink_targets[1],
]
}
if (deploy_chrome) {
_toolchain_sdk_items = [
_symlink_targets[2],
_symlink_targets[3],
]
}
if (cros_is_vm) {
_vm_sdk_items = [
_symlink_targets[4],
_symlink_targets[5],
_symlink_targets[6],
]
}
}
}
# TODO(crbug.com/1112471): Get this to run cleanly under Python 3. # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
python2_action(target_name) { python2_action(target_name) {
...@@ -263,25 +171,21 @@ template("generate_runner_script") { ...@@ -263,25 +171,21 @@ template("generate_runner_script") {
args += [ "--deploy-chrome" ] args += [ "--deploy-chrome" ]
} }
if (is_chromeos_lacros) {
args += [ "--deploy-lacros" ]
}
# If we're in the cros chrome-sdk (and not the raw ebuild), the test will # If we're in the cros chrome-sdk (and not the raw ebuild), the test will
# need some additional runtime data located in the SDK cache. # need some additional runtime data located in the SDK cache.
if (cros_sdk_version != "") { if (cros_sdk_version != "") {
# Add the VM/QEMU-launching bits if needed. # Add the VM/QEMU-launching bits if needed.
if (cros_is_vm) { if (cros_is_vm) {
data += _vm_sdk_items data += vm_sdk_items
} }
if (is_tast) { if (is_tast) {
data += _tast_sdk_items data += tast_sdk_items
} }
if (deploy_chrome) { if (deploy_chrome) {
# To deploy chrome to the VM, it needs to be stripped down to fit into # To deploy chrome to the VM, it needs to be stripped down to fit into
# the VM. This is done by using binutils in the toolchain. So add the # the VM. This is done by using binutils in the toolchain. So add the
# toolchain to the data. # toolchain to the data.
data += _toolchain_sdk_items data += toolchain_sdk_items
} }
} }
...@@ -319,14 +223,6 @@ template("generate_runner_script") { ...@@ -319,14 +223,6 @@ template("generate_runner_script") {
] ]
} }
} }
if (defined(tast_vars)) {
foreach(var, tast_vars) {
args += [
"--tast-var",
var,
]
}
}
} }
} }
} }
...@@ -382,39 +278,6 @@ template("tast_test") { ...@@ -382,39 +278,6 @@ template("tast_test") {
"//third_party/breakpad:minidump_dump", "//third_party/breakpad:minidump_dump",
"//third_party/breakpad:minidump_stackwalk", "//third_party/breakpad:minidump_stackwalk",
] ]
data = [ "//components/crash/content/tools/generate_breakpad_symbols.py" ]
}
}
template("lacros_tast_test") {
forward_variables_from(invoker,
[
"override_board",
"tast_tests",
])
generate_runner_script(target_name) {
testonly = true
generated_script = "$root_build_dir/bin/run_${target_name}"
runtime_deps_file = "$root_out_dir/${target_name}.runtime_deps"
# By default, tast tests download a lacros-chrome from a gcs location and
# use it for testing. To support running lacros tast tests from Chromium CI,
# a Var is added to support pointing the tast tests to use a specified
# pre-deployed lacros-chrome. The location is decided by:
# https://source.chromium.org/chromium/chromium/src/+/master:third_party/chromite/scripts/deploy_chrome.py;l=80;drc=86f1234a4be8e9574442e076cdc835897f7bea61
tast_vars = [ "lacrosDeployedBinary=/usr/local/lacros-chrome" ]
data_deps = [
"//chrome", # Builds the browser.
# Tools used to symbolize Chrome crash dumps.
# TODO(crbug.com/1156772): Remove these if/when all tests pick them up by
# default.
"//third_party/breakpad:dump_syms",
"//third_party/breakpad:minidump_dump",
"//third_party/breakpad:minidump_stackwalk",
]
data = [ "//components/crash/content/tools/generate_breakpad_symbols.py" ] data = [ "//components/crash/content/tools/generate_breakpad_symbols.py" ]
} }
} }
chromeos/lacros/BUILD.gn
View file @ 501fec5e
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/chromeos/rules.gni")
import("//build/config/chromeos/ui_mode.gni") import("//build/config/chromeos/ui_mode.gni")
import("//build/config/linux/gtk/gtk.gni") import("//build/config/linux/gtk/gtk.gni")
import("//build/lacros/lacros_resource_sizes.gni") import("//build/lacros/lacros_resource_sizes.gni")
...@@ -31,41 +30,3 @@ component("lacros") { ...@@ -31,41 +30,3 @@ component("lacros") {
lacros_resource_sizes_test("resource_sizes_lacros_chrome") { lacros_resource_sizes_test("resource_sizes_lacros_chrome") {
data_deps = [ "//chrome:chrome" ] data_deps = [ "//chrome:chrome" ]
} }
# "cros_board" set in the GN args defines the board used to build lacros-chrome,
# while the "override_board" here defines the board on which to test the built
# binary, for more details, please refer to the "generate_runner_script"
# template in //build/config/chromeos/rules.gni.
template("lacros_tast_test_helper") {
forward_variables_from(invoker, [ "override_board" ])
assert(defined(override_board), "override_board is required")
lacros_tast_test(target_name) {
# TODO(crbug.com/1158590): use --attr-expr instead of hard-coding the tests.
tast_tests = [
"lacros.AudioPlay",
"lacros.AppLauncherLaunch",
"lacros.Basic",
"lacros.ShelfLaunch",
]
}
}
# On Chromium CI, only a very limited number of boards are supported:
# amd64-generic, eve, kevin etc, so just hard-coding them for simplicity.
if (is_chromeos_device) {
_boards = string_split(cros_boards, ":") +
string_split(cros_boards_with_qemu_images, ":")
foreach(b, _boards) {
if (b == "amd64-generic") {
lacros_tast_test_helper("lacros_tast_tests_amd64_generic") {
override_board = "amd64-generic"
}
}
if (b == "eve") {
lacros_tast_test_helper("lacros_tast_tests_eve") {
override_board = "eve"
}
}
}
}
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