Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 26 additions & 10 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ build:toolchain_common --extra_toolchains=@score_toolchains_rust//toolchains/fer
build:stub --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
build:stub --@score_baselibs//score/json:base_library=nlohmann

# Target configuration for running integration tests on localhost
build:host --define config=host
# Target configuration for running tests on localhost
build:host --//config:integration_mode=host
build:host --//config:unit_mode=host

# Target configuration for CPU:x86-64|OS:Linux build (do not use it in case of system toolchains!)
build:x86_64-linux --config=stub
Expand All @@ -67,7 +68,9 @@ build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-
build:x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0
build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu_miri
build:x86_64-linux --define config=x86_64-linux

test:x86_64-linux --//config:integration_mode=docker
test:x86_64-linux --//config:unit_mode=host

# Target configuration for CPU:AArch64|OS:Linux build (do not use it in case of system toolchains!)
build:arm64-linux --config=stub
Expand All @@ -79,16 +82,25 @@ build:arm64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocen
build:arm64-linux --copt=-mno-outline-atomics
build:arm64-linux --linkopt=-latomic

test:arm64-linux --//config:integration_mode=docker
test:arm64-linux --//config:unit_mode=host

# Target configuration for CPU:x86-64|OS:QNX build (do not use it in case of system toolchains!)
build:x86_64-qnx --config=stub
build:x86_64-qnx --config=toolchain_common
build:x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix
build:x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0
build:x86_64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800
build:x86_64-qnx --extra_toolchains=@score_qnx_x86_64_ifs_toolchain//:ifs-x86_64-qnx-sdp_8.0.0
test:x86_64-qnx --run_under=@score_qnx_unit_tests//src:run_under_qnx
test:x86_64-qnx --test_tag_filters=-skip_local # see https://github.com/eclipse-score/lifecycle/issues/272
test:x86_64-qnx --test_lang_filters=cc,rust

test:x86_64-qnx --//config:integration_mode=qemu
test:x86_64-qnx --//config:unit_mode=skip

build:unit-tests-x86_64-qnx --config=x86_64-qnx
Comment thread
danth marked this conversation as resolved.
Comment thread
danth marked this conversation as resolved.

test:unit-tests-x86_64-qnx --run_under=@score_qnx_unit_tests//src:run_under_qnx
test:unit-tests-x86_64-qnx --//config:integration_mode=skip
test:unit-tests-x86_64-qnx --//config:unit_mode=qemu

# Target configuration for CPU:AArch64|OS:QNX build (do not use it in case of system toolchains!)
build:arm64-qnx --config=stub
Expand All @@ -98,11 +110,15 @@ build:arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix
build:arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0
build:arm64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800
build:arm64-qnx --extra_toolchains=@score_qnx_aarch64_ifs_toolchain//:ifs-aarch64-qnx-sdp_8.0.0
test:arm64-qnx --run_under=@score_qnx_unit_tests//src:run_under_qnx
test:arm64-qnx --test_tag_filters=-skip_local # see https://github.com/eclipse-score/lifecycle/issues/272
test:arm64-qnx --test_timeout=300
test:arm64-qnx --test_lang_filters=cc,rust

test:arm64-qnx --//config:integration_mode=qemu
test:arm64-qnx --//config:unit_mode=skip

build:unit-tests-arm64-qnx --config=arm64-qnx

test:unit-tests-arm64-qnx --run_under=@score_qnx_unit_tests//src:run_under_qnx
test:unit-tests-arm64-qnx --//config:integration_mode=skip
test:unit-tests-arm64-qnx --//config:unit_mode=qemu

# Ferrocene Rust coverage config
build:ferrocene-coverage --@rules_rust//rust/settings:extra_rustc_flag=-Cinstrument-coverage
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/qnx8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ jobs:
matrix:
include:
- bazel-config: x86_64-qnx
bazel-test-target: >-
//score/...
bazel-test-target: //examples/... //score/... //tests/...
- bazel-config: unit-tests-x86_64-qnx
bazel-test-target: //examples/... //score/... //tests/...
- bazel-config: arm64-qnx
bazel-test-target: >-
//score/...
bazel-test-target: //examples/... //score/... //tests/...
- bazel-config: unit-tests-arm64-qnx
bazel-test-target: //examples/... //score/... //tests/...
extra-bazel-test-flags: "--test_timeout=120,600,1800,7200" # Increase test timeout due to QEMU emulation
uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@473c10b74361afb7506a5d35ea554030753d5594
permissions:
Expand Down
1 change: 0 additions & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ compile_pip_requirements(
src = "requirements.in",
data = [
"//scripts/config_mapping:pip_requirements",
"//tests/integration:pip_requirements",
],
extra_args = [
"--no-annotate",
Expand Down
4 changes: 4 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ pip.parse(
use_repo(pip, "score_lifecycle_pip")

bazel_dep(name = "score_itf", version = "0.5.0", dev_dependency = True)
single_version_override(
module_name = "score_itf",
patches = ["//patches:itf.patch"],
)

oci = use_extension("@rules_oci//oci:extensions.bzl", "oci", dev_dependency = True)
oci.pull(
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,22 @@ bazel build --config=x86_64-qnx //...
bazel build --config=arm64-qnx //...
```

Integration tests via [QEMU](https://www.qemu.org/):

```sh
bazel test --config=x86_64-qnx //tests/integration/...
```

Unit tests via [QEMU](https://www.qemu.org/):

```sh
bazel test --config=unit-tests-x86_64-qnx //score/...
```

A different flag is needed for unit tests because the emulation is configured
using `--run_under`, which applies to all targets, even those that should run
natively on the host.

**Linux**

```sh
Expand Down
67 changes: 60 additions & 7 deletions config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,72 @@
#
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")

# How to run integration tests:
#
# - docker: in a Docker container
# - qemu: in a QEMU virtual machine
# - host: on the current machine
# - skip: do not run integration tests
string_flag(
Comment thread
danth marked this conversation as resolved.
name = "integration_mode",
build_setting_default = "host",
values = [
"docker",
"qemu",
"host",
"skip",
],
)

config_setting(
name = "x86_64-linux",
define_values = {
"config": "x86_64-linux",
name = "integration_docker",
flag_values = {
":integration_mode": "docker",
},
)

config_setting(
name = "x86_64-qnx",
define_values = {
"config": "x86_64-qnx",
name = "integration_qemu",
flag_values = {
":integration_mode": "qemu",
},
)

config_setting(
name = "integration_host",
flag_values = {
":integration_mode": "host",
},
)

# How to run unit tests:
#
# - qemu: in a QEMU virtual machine
# - host: on the current machine
# - skip: do not run unit tests
string_flag(
name = "unit_mode",
build_setting_default = "host",
values = [
"qemu",
"host",
"skip",
],
)

config_setting(
name = "unit_qemu",
flag_values = {
":unit_mode": "qemu",
},
)

config_setting(
name = "unit_host",
flag_values = {
":unit_mode": "host",
},
)

Expand Down
2 changes: 1 addition & 1 deletion examples/demo_verification/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def test_examples(target, setup_test, remote_test_dir):
_assert_not_running(target, "cpp_supervised_app")

_step("Stopping launch manager (SIGTERM)")
res, _ = target.execute(f"kill -15 -{lm_proc.pid()}")
res, _ = target.execute(f"kill -TERM {lm_proc.pid()}")
assert res == 0, "Failed to send SIGTERM to launch manager process group"
time.sleep(0.5)
assert not lm_proc.is_running(), "Launch manager did not stop after SIGTERM"
15 changes: 15 additions & 0 deletions patches/itf.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# https://github.com/eclipse-score/itf/pull/127

--- score/itf/plugins/qemu/qemu_target.py
+++ score/itf/plugins/qemu/qemu_target.py
@@ -173,9 +173,7 @@ def execute_async(self, binary_path, args=None, cwd="/", **kwargs) -> QemuAsyncP
transport = ssh_ctx.get_paramiko_client().get_transport()
channel = transport.open_session()
channel.set_combine_stderr(True)
- inner = (
- f"[ -r /etc/profile ] && . /etc/profile >/dev/null 2>&1; echo $$; cd {shlex.quote(cwd)} && {command}"
- )
+ inner = f"[ -r /etc/profile ] && . /etc/profile >/dev/null 2>&1; echo $$; cd {shlex.quote(cwd)} && exec {command}"
channel.exec_command(f"sh -lc {shlex.quote(inner)}")

# Read the PID from the first line of output.
3 changes: 0 additions & 3 deletions requirements.in
Comment thread
danth marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# Python dependencies for generating lifecycle configuration files
-r ./scripts/config_mapping/requirements.txt

-r ./tests/integration/requirements.txt

3 changes: 0 additions & 3 deletions requirements_lock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ jsonschema==4.23.0 \
jsonschema-specifications==2023.12.1 \
--hash=sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc \
--hash=sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c
junitparser==5.0.0 \
--hash=sha256:9e279f2214dc74b6a86b22db757abda2e8e66e819fe882dad5b392d57024cd26 \
--hash=sha256:f15e292877258d7c5755d672ce86f82c3622c7ea4c2f44f55de44ed7518484d3
packaging==26.0 \
--hash=sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4 \
--hash=sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529
Expand Down
10 changes: 10 additions & 0 deletions score/health_monitor/src/cpp/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ cc_gtest_unit_test(
"@platforms//os:qnx": ["-lsocket"],
"@platforms//os:linux": [],
}),
target_compatible_with = select({
"//config:unit_qemu": [],
"//config:unit_host": [],
"//conditions:default": ["@platforms//:incompatible"],
}),
deps = [
"//score/health_monitor/src/cpp:health_monitoring_cc_stub_supervisor",
"//score/health_monitor/src/cpp/details:log_init",
Expand All @@ -96,6 +101,11 @@ cc_gtest_unit_test(
"@platforms//os:linux": [],
}),
tags = ["no-tsan"],
target_compatible_with = select({
"//config:unit_qemu": [],
"//config:unit_host": [],
"//conditions:default": ["@platforms//:incompatible"],
}),
deps = [
"//score/health_monitor/src/cpp:health_monitoring_cc_stub_supervisor",
"//score/health_monitor/src/cpp/details:log_init",
Expand Down
18 changes: 15 additions & 3 deletions score/health_monitor/src/rust/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ rust_test(
tags = [
"no-asan",
"no-tsan",
"skip_local", # see https://github.com/eclipse-score/lifecycle/issues/272
],
target_compatible_with = select({
"//config:unit_qemu": ["@platforms//os:linux"], # see https://github.com/eclipse-score/lifecycle/issues/272
"//config:unit_host": ["@platforms//os:linux"], # see https://github.com/eclipse-score/lifecycle/issues/272
"//conditions:default": ["@platforms//:incompatible"],
}),
deps = ["@score_baselibs//src/log/stdout_logger"],
)

Expand All @@ -100,7 +104,11 @@ rust_test(
"no-asan",
"no-tsan",
],
target_compatible_with = ["@platforms//os:linux"],
target_compatible_with = select({
"//config:unit_qemu": ["@platforms//os:linux"],
"//config:unit_host": ["@platforms//os:linux"],
"//conditions:default": ["@platforms//:incompatible"],
}),
deps = [
"@score_baselibs//src/log/stdout_logger",
"@score_crates//:loom",
Expand All @@ -119,5 +127,9 @@ miri_test(
"miri",
"no-asan",
],
target_compatible_with = ["@platforms//os:linux"],
target_compatible_with = select({
"//config:unit_qemu": ["@platforms//os:linux"],
"//config:unit_host": ["@platforms//os:linux"],
"//conditions:default": ["@platforms//:incompatible"],
}),
)
2 changes: 1 addition & 1 deletion score/launch_manager/src/daemon/src/common/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ cc_library(
visibility = ["//score/launch_manager/src/daemon:__subpackages__"],
)

cc_test(
lm_cc_test(
name = "signal_safe_log_UT",
srcs = ["signal_safe_log_UT.cpp"],
deps = [
Expand Down
20 changes: 0 additions & 20 deletions tests/integration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,3 @@
#
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

load("@rules_python//python:pip.bzl", "compile_pip_requirements")
load("@score_lifecycle_pip//:requirements.bzl", "requirement")
load("@score_tooling//python_basics:defs.bzl", "score_virtualenv")

filegroup(
name = "pip_requirements",
srcs = ["requirements.txt"],
visibility = ["//:__pkg__"],
)

# Only pass packages that don't overlap with pip_tooling (which already
# provides: iniconfig, packaging, pluggy, pygments, pytest).
score_virtualenv(
name = "python_tc_venv",
reqs = [
requirement("junitparser"),
],
venv_name = ".python_tc_venv",
)
3 changes: 3 additions & 0 deletions tests/integration/process_fd_leak/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ cc_binary(
"get_fds.hpp",
"native.cpp",
],
target_compatible_with = ["@platforms//os:linux"],
deps = [
"//tests/utils/test_helper",
"@googletest//:gtest_main",
Expand All @@ -34,6 +35,7 @@ cc_binary(
"get_fds.hpp",
"reporting.cpp",
],
target_compatible_with = ["@platforms//os:linux"],
deps = [
"//score/launch_manager:lifecycle_cc",
"//tests/utils/test_helper",
Expand All @@ -48,6 +50,7 @@ cc_binary(
"control_client.cpp",
"get_fds.hpp",
],
target_compatible_with = ["@platforms//os:linux"],
Comment thread
danth marked this conversation as resolved.
deps = [
"//score/launch_manager:control_cc",
"//score/launch_manager:lifecycle_cc",
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/requirements.txt

This file was deleted.

Loading
Loading