Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

starboard: Create starboard_unittest_wrapper #5031

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

starboard: Create starboard_unittest_wrapper #5031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17a4934
Follow up to https://github.com/youtube/cobalt/pull/4831 -- starboard…
yell0wd0g Mar 6, 2025
4a5fb6f
Fix Android build
yell0wd0g Mar 7, 2025
8a85dc8
Merge branch 'main' into b_384819454__2__followup_starboard_unittests
yell0wd0g Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cobalt/build/testing/targets/linux-x64x11/test_targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"services/service_manager/tests:service_manager_unittests",
"skia:skia_unittests",
"sql:sql_unittests",
"starboard:starboard_unittests",
"starboard:starboard_unittests_wrapper",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Putting a non-test target here isn't going to work. The infra expects a runtime deps file to be created for each of these targets and currently that's only done for test targets.

What are you trying to achieve by putting the group target here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrewsavage1 knows better the intention, but IIUC we want to have a trampoline GN target to make sure we build with the starboard_toolchain. What would be a good way to codify that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's wait on this until #4464 lands

"ui/ozone:ozone_unittests",
"ui/wm:wm_unittests",
"url:url_perftests",
Expand Down Expand Up @@ -62,7 +62,7 @@
"out/linux-x64x11_devel/service_manager_unittests",
"out/linux-x64x11_devel/skia_unittests",
"out/linux-x64x11_devel/sql_unittests",
"out/linux-x64x11_devel/starboard_unittests",
"out/linux-x64x11_devel/starboard/starboard_unittests",
"out/linux-x64x11_devel/wm_unittests",
"out/linux-x64x11_devel/url_perftests",
"out/linux-x64x11_devel/url_unittests",
Expand Down
36 changes: 17 additions & 19 deletions starboard/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,27 +291,25 @@ if (current_toolchain == starboard_toolchain) {
public_deps += [ "//$starboard_path:starboard_platform_with_main" ]
}
}
}

# TODO(b/384819454): Move this guy to the block above and define here a
# group("starboard_unittests_wrapper") {
# testonly = true
# deps = [ ":starboard_unittests($starboard_toolchain)" ]
# }
# then modify //cobalt/build/...test_targets.json to point to it instead of
# starboard_unittests directly.
test("starboard_unittests") {
deps = [ "//starboard/common:common_test" ]
if (sb_is_evergreen_compatible) {
deps += [
"//starboard/client_porting/eztime:eztime_test",
"//starboard/extension:extension_test",
"//starboard/loader_app:app_key_files_test",
"//starboard/loader_app:app_key_test",
"//starboard/loader_app:drain_file_test",
]
if (current_toolchain == starboard_toolchain) {
test("starboard_unittests") {
deps = [ "//starboard/common:common_test" ]
if (!is_android) {
deps += [ "//starboard/elf_loader:elf_loader_test" ]
}
if (sb_is_evergreen_compatible) {
deps += [
"//starboard/client_porting/eztime:eztime_test",
"//starboard/extension:extension_test",
"//starboard/loader_app:app_key_files_test",
"//starboard/loader_app:app_key_test",
"//starboard/loader_app:drain_file_test",
]
}
}
}

group("starboard_unittests_wrapper") {
testonly = true
deps = [ ":starboard_unittests($starboard_toolchain)" ]
}
Loading