From 3c7194c9e8e0a1a27090c81d388cd3e883ef1a85 Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Mon, 13 Jul 2026 13:20:28 +0100 Subject: [PATCH] Treat warnings as errors --- .bazelrc | 1 - config/common_cc.bzl | 47 +++++-------------- config/common_opts.bzl | 30 ------------ examples/c_supervised_app/BUILD | 4 +- examples/c_supervised_app/main.c | 9 +++- examples/control_application/BUILD | 6 +-- .../control_application/control_daemon.cpp | 2 +- examples/cpp_lifecycle_app/BUILD | 5 +- examples/cpp_supervised_app/BUILD | 4 +- score/health_monitor/BUILD | 2 +- score/health_monitor/src/cpp/BUILD | 12 ++--- score/health_monitor/src/cpp/common.h | 4 +- score/health_monitor/src/cpp/deadline/BUILD | 4 +- score/health_monitor/src/cpp/details/BUILD | 6 +-- score/health_monitor/src/cpp/heartbeat/BUILD | 4 +- score/health_monitor/src/cpp/logic/BUILD | 4 +- score/launch_manager/BUILD | 6 +-- score/launch_manager/src/alive/BUILD | 4 +- .../src/alive/src/details/BUILD | 4 +- score/launch_manager/src/control_client/BUILD | 4 +- .../src/control_client/src/control_client.cpp | 4 +- .../src/control_client/src/details/BUILD | 4 +- score/launch_manager/src/daemon/BUILD | 4 +- .../src/daemon/src/alive_monitor/BUILD | 4 +- .../src/daemon/src/alive_monitor/config/BUILD | 4 +- .../src/alive_monitor/details/common/BUILD | 12 ++--- .../src/alive_monitor/details/daemon/BUILD | 12 ++--- .../src/alive_monitor/details/factory/BUILD | 10 ++-- .../details/factory/FlatCfgFactory.cpp | 2 +- .../details/factory/MachineConfigFactory.cpp | 2 +- .../src/alive_monitor/details/ifappl/BUILD | 8 ++-- .../src/alive_monitor/details/ifexm/BUILD | 8 ++-- .../src/alive_monitor/details/ipc/BUILD | 4 +- .../src/alive_monitor/details/logging/BUILD | 4 +- .../alive_monitor/details/supervision/BUILD | 8 ++-- .../src/alive_monitor/details/timers/BUILD | 10 ++-- .../src/alive_monitor/details/watchdog/BUILD | 12 ++--- .../details/watchdog/WatchdogImpl.cpp | 2 +- .../src/daemon/src/common/BUILD | 10 ++-- .../src/daemon/src/common/concurrency/BUILD | 10 ++-- .../src/common/concurrency/details/BUILD | 4 +- .../src/daemon/src/configuration/BUILD | 13 ++--- .../src/configuration/config_schema/BUILD | 5 +- .../configuration/configuration_manager.cpp | 2 +- .../details/flatbuffer_type_converters.cpp | 2 +- .../details/flatbuffer_type_converters.hpp | 2 +- .../src/daemon/src/control/BUILD | 4 +- .../launch_manager/src/daemon/src/osal/BUILD | 20 ++++---- .../daemon/src/process_group_manager/BUILD | 12 ++--- .../src/process_group_manager/details/BUILD | 14 +++--- .../src/daemon/src/process_state_client/BUILD | 14 +++--- .../src/process_state_client/details/BUILD | 4 +- .../process_state_client_ut.cpp | 4 ++ .../src/daemon/src/recovery_client/BUILD | 6 ++- .../launch_manager/src/lifecycle_client/BUILD | 23 ++++----- .../src/lifecycle_client/src/details/BUILD | 4 +- tests/integration/complex_monitoring/BUILD | 6 +-- .../component_complex_monitoring.cpp | 2 +- .../control_client_mock.cpp | 7 ++- tests/integration/crash_on_startup/BUILD | 8 ++-- .../crash_on_startup/control_client_mock.cpp | 5 +- .../incorrect_config_non_reporting/BUILD | 4 +- .../process_complex_rep_failure/BUILD | 6 +-- .../control_client_mock.cpp | 2 +- .../process_crash_monitoring/BUILD | 6 +-- .../control_client_mock.cpp | 2 +- tests/integration/process_fd_leak/BUILD | 8 ++-- tests/integration/process_launch_args/BUILD | 4 +- .../process_simple_rep_failure/BUILD | 6 +-- .../control_client_mock.cpp | 2 +- .../process_wrong_binary_failure/BUILD | 4 +- .../control_client_mock.cpp | 2 +- tests/integration/smoke/BUILD | 6 +-- .../integration/smoke/control_daemon_mock.cpp | 2 +- tests/integration/switch_run_target/BUILD | 11 ++--- .../switch_run_target/control_client_mock.cpp | 2 +- tests/utils/test_helper/BUILD | 10 ++-- .../test_helper/complex_reporting_process.cpp | 4 ++ 78 files changed, 255 insertions(+), 283 deletions(-) delete mode 100644 config/common_opts.bzl diff --git a/.bazelrc b/.bazelrc index a31dd6992..111b7a112 100644 --- a/.bazelrc +++ b/.bazelrc @@ -26,7 +26,6 @@ build --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py # Common test flags for all platforms test --test_output=errors test --@score_baselibs//score/json:base_library=nlohmann -test --cxxopt=-Wno-deprecated-declarations # Coverage configuration for C++ coverage --features=coverage diff --git a/config/common_cc.bzl b/config/common_cc.bzl index b46a1a00d..6d998ca61 100644 --- a/config/common_cc.bzl +++ b/config/common_cc.bzl @@ -12,48 +12,23 @@ # ******************************************************************************* load("@rules_cc//cc:cc_binary.bzl", "cc_binary") load("@rules_cc//cc:cc_library.bzl", "cc_library") -load("//config:common_opts.bzl", "SANITIZER_CXXOPTS", "SANITIZER_LINKOPTS") -_def_or_empty = lambda v: v if v else [] +COMMON_OPTIONS = [ + "-Wall", + "-Wextra", + "-Werror", +] -def cc_library_with_common_opts( - name, - srcs = None, - hdrs = None, - deps = None, - cxxopts = None, - linkopts = None, - omit_common_cxxopts = False, - omit_common_linkopts = False, - **kwargs): - base_cxx = [] if omit_common_cxxopts else SANITIZER_CXXOPTS - base_link = [] if omit_common_linkopts else SANITIZER_LINKOPTS +def cc_library_with_common_options(**kwargs): cc_library( - name = name, - srcs = _def_or_empty(srcs), - hdrs = _def_or_empty(hdrs), - deps = _def_or_empty(deps), - cxxopts = base_cxx + _def_or_empty(cxxopts), - linkopts = base_link + _def_or_empty(linkopts), + copts = COMMON_OPTIONS + kwargs.pop("copts", []), + cxxopts = COMMON_OPTIONS + kwargs.pop("cxxopts", []), **kwargs ) -def cc_binary_with_common_opts( - name, - srcs = None, - deps = None, - cxxopts = None, - linkopts = None, - omit_common_cxxopts = False, - omit_common_linkopts = False, - **kwargs): - base_cxx = [] if omit_common_cxxopts else SANITIZER_CXXOPTS - base_link = [] if omit_common_linkopts else SANITIZER_LINKOPTS +def cc_binary_with_common_options(**kwargs): cc_binary( - name = name, - srcs = _def_or_empty(srcs), - deps = _def_or_empty(deps), - cxxopts = base_cxx + _def_or_empty(cxxopts), - linkopts = base_link + _def_or_empty(linkopts), + copts = COMMON_OPTIONS + kwargs.pop("copts", []), + cxxopts = COMMON_OPTIONS + kwargs.pop("cxxopts", []), **kwargs ) diff --git a/config/common_opts.bzl b/config/common_opts.bzl deleted file mode 100644 index 17996d106..000000000 --- a/config/common_opts.bzl +++ /dev/null @@ -1,30 +0,0 @@ -# ******************************************************************************* -# Copyright (c) 2025 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# SPDX-License-Identifier: Apache-2.0 -# ******************************************************************************* -SANITIZER_CXXOPTS = select({ - "//config:thread_sanitizer_enabled": ["-fsanitize=thread", "-O0", "-g"], - "//config:ub_sanitizer_enabled": ["-fsanitize=undefined", "-O0", "-g"], - "//config:address_sanitizer_enabled": [ - "-fsanitize=address", - "-fno-omit-frame-pointer", - "-O1", - "-g", - ], - "//conditions:default": [], -}) - -SANITIZER_LINKOPTS = select({ - "//config:thread_sanitizer_enabled": ["-fsanitize=thread"], - "//config:ub_sanitizer_enabled": ["-fsanitize-link-c++-runtime", "-fsanitize=undefined"], - "//config:address_sanitizer_enabled": ["-fsanitize=address"], - "//conditions:default": [], -}) diff --git a/examples/c_supervised_app/BUILD b/examples/c_supervised_app/BUILD index 97deed6d6..f796ff0f2 100644 --- a/examples/c_supervised_app/BUILD +++ b/examples/c_supervised_app/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") -cc_binary( +cc_binary_with_common_options( name = "c_supervised_app", srcs = [ "main.c", diff --git a/examples/c_supervised_app/main.c b/examples/c_supervised_app/main.c index 1fddc7321..83d48868e 100644 --- a/examples/c_supervised_app/main.c +++ b/examples/c_supervised_app/main.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include @@ -29,6 +29,11 @@ static void signal_handler(int signal) } } +const struct timespec interval = { + .tv_sec = 0, + .tv_nsec = 50000000, +}; + int main(void) { signal(SIGINT, signal_handler); @@ -51,7 +56,7 @@ int main(void) while (!exit_requested) { score_lcm_alive_report_alive(alive); - usleep(50000); + nanosleep(&interval, NULL); } score_lcm_alive_deinitialize(alive); diff --git a/examples/control_application/BUILD b/examples/control_application/BUILD index 10f036607..6fc791ca0 100644 --- a/examples/control_application/BUILD +++ b/examples/control_application/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") -cc_binary( +cc_binary_with_common_options( name = "lmcontrol", srcs = [ "control.hpp", @@ -35,7 +35,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "control_daemon", srcs = [ "control.hpp", diff --git a/examples/control_application/control_daemon.cpp b/examples/control_application/control_daemon.cpp index 59404855c..f3274061a 100644 --- a/examples/control_application/control_daemon.cpp +++ b/examples/control_application/control_daemon.cpp @@ -26,7 +26,7 @@ void signalHandler(int) { exitRequested = true; } -int main(int argc, char** argv) { +int main() { signal(SIGINT, signalHandler); signal(SIGTERM, signalHandler); diff --git a/examples/cpp_lifecycle_app/BUILD b/examples/cpp_lifecycle_app/BUILD index bb5de2823..131298d25 100644 --- a/examples/cpp_lifecycle_app/BUILD +++ b/examples/cpp_lifecycle_app/BUILD @@ -10,7 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -cc_binary( + +load("//config:common_cc.bzl", "cc_binary_with_common_options") + +cc_binary_with_common_options( name = "cpp_lifecycle_app", srcs = [ "main.cpp", diff --git a/examples/cpp_supervised_app/BUILD b/examples/cpp_supervised_app/BUILD index 984f35938..1f8da87fa 100644 --- a/examples/cpp_supervised_app/BUILD +++ b/examples/cpp_supervised_app/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") -cc_binary( +cc_binary_with_common_options( name = "cpp_supervised_app", srcs = [ "main.cpp", diff --git a/score/health_monitor/BUILD b/score/health_monitor/BUILD index 6d250130a..e8df63b5e 100644 --- a/score/health_monitor/BUILD +++ b/score/health_monitor/BUILD @@ -11,7 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") alias( name = "health_monitoring_cc", diff --git a/score/health_monitor/src/cpp/BUILD b/score/health_monitor/src/cpp/BUILD index 8fbace30b..05cff0c0c 100644 --- a/score/health_monitor/src/cpp/BUILD +++ b/score/health_monitor/src/cpp/BUILD @@ -11,10 +11,10 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") load("@score_baselibs//:bazel/unit_tests.bzl", "cc_gtest_unit_test") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "tag", hdrs = ["tag.h"], include_prefix = "score/mw/health", @@ -22,7 +22,7 @@ cc_library( visibility = ["//visibility:public"], ) -cc_library( +cc_library_with_common_options( name = "common", srcs = ["common.cpp"], hdrs = ["common.h"], @@ -32,7 +32,7 @@ cc_library( deps = ["@score_baselibs//score/language/futurecpp"], ) -cc_library( +cc_library_with_common_options( name = "health_monitor", srcs = ["health_monitor.cpp"], hdrs = ["health_monitor.h"], @@ -49,7 +49,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "health_monitoring_cc", visibility = ["//score/health_monitor:__pkg__"], deps = [ @@ -58,7 +58,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "health_monitoring_cc_stub_supervisor", visibility = ["//score/health_monitor/src/cpp:__pkg__"], deps = [ diff --git a/score/health_monitor/src/cpp/common.h b/score/health_monitor/src/cpp/common.h index 641a7aca8..b6e349951 100644 --- a/score/health_monitor/src/cpp/common.h +++ b/score/health_monitor/src/cpp/common.h @@ -98,12 +98,12 @@ class TimeRange SCORE_LANGUAGE_FUTURECPP_PRECONDITION(min_ms_ <= max_ms_); } - const uint32_t min_ms() const + uint32_t min_ms() const { return min_ms_.count(); } - const uint32_t max_ms() const + uint32_t max_ms() const { return max_ms_.count(); } diff --git a/score/health_monitor/src/cpp/deadline/BUILD b/score/health_monitor/src/cpp/deadline/BUILD index 98cf96049..cfd08c8a0 100644 --- a/score/health_monitor/src/cpp/deadline/BUILD +++ b/score/health_monitor/src/cpp/deadline/BUILD @@ -11,9 +11,9 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "deadline_monitor", srcs = ["deadline_monitor.cpp"], hdrs = ["deadline_monitor.h"], diff --git a/score/health_monitor/src/cpp/details/BUILD b/score/health_monitor/src/cpp/details/BUILD index 6dbd9e45f..d1c0e30bf 100644 --- a/score/health_monitor/src/cpp/details/BUILD +++ b/score/health_monitor/src/cpp/details/BUILD @@ -11,9 +11,9 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "log_init", srcs = ["log_init.cpp"], visibility = ["//score/health_monitor/src/cpp:__pkg__"], @@ -23,7 +23,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "thread", srcs = ["thread.cpp"], hdrs = ["thread.h"], diff --git a/score/health_monitor/src/cpp/heartbeat/BUILD b/score/health_monitor/src/cpp/heartbeat/BUILD index f603e9deb..5cb1e2acc 100644 --- a/score/health_monitor/src/cpp/heartbeat/BUILD +++ b/score/health_monitor/src/cpp/heartbeat/BUILD @@ -11,9 +11,9 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "heartbeat_monitor", srcs = ["heartbeat_monitor.cpp"], hdrs = ["heartbeat_monitor.h"], diff --git a/score/health_monitor/src/cpp/logic/BUILD b/score/health_monitor/src/cpp/logic/BUILD index 8162812bf..845530bc3 100644 --- a/score/health_monitor/src/cpp/logic/BUILD +++ b/score/health_monitor/src/cpp/logic/BUILD @@ -11,9 +11,9 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "logic_monitor", srcs = ["logic_monitor.cpp"], hdrs = ["logic_monitor.h"], diff --git a/score/launch_manager/BUILD b/score/launch_manager/BUILD index d6eda34ae..f631e74f3 100644 --- a/score/launch_manager/BUILD +++ b/score/launch_manager/BUILD @@ -10,7 +10,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") package(default_visibility = ["//visibility:public"]) @@ -44,7 +44,7 @@ alias( actual = "//score/launch_manager/src/daemon:launch_manager", ) -cc_library( +cc_library_with_common_options( name = "error", hdrs = ["src/execution_error.h"], include_prefix = "score/mw/lifecycle", @@ -55,7 +55,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "error_event", hdrs = [ "src/execution_error.h", diff --git a/score/launch_manager/src/alive/BUILD b/score/launch_manager/src/alive/BUILD index 6e3c356cb..045fec98a 100644 --- a/score/launch_manager/src/alive/BUILD +++ b/score/launch_manager/src/alive/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "alive", srcs = [ "src/alive.cpp", diff --git a/score/launch_manager/src/alive/src/details/BUILD b/score/launch_manager/src/alive/src/details/BUILD index d7f10cdbc..69d8460ba 100644 --- a/score/launch_manager/src/alive/src/details/BUILD +++ b/score/launch_manager/src/alive/src/details/BUILD @@ -10,7 +10,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") cc_test( name = "AliveImpl_UT", @@ -21,7 +21,7 @@ cc_test( ], ) -cc_library( +cc_library_with_common_options( name = "alive_impl", srcs = ["AliveImpl.cpp"], hdrs = ["AliveImpl.h"], diff --git a/score/launch_manager/src/control_client/BUILD b/score/launch_manager/src/control_client/BUILD index 370c6c123..2d2baff7a 100644 --- a/score/launch_manager/src/control_client/BUILD +++ b/score/launch_manager/src/control_client/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "control_client", srcs = [ "src/control_client.cpp", diff --git a/score/launch_manager/src/control_client/src/control_client.cpp b/score/launch_manager/src/control_client/src/control_client.cpp index 29699afc2..2c9ce7247 100644 --- a/score/launch_manager/src/control_client/src/control_client.cpp +++ b/score/launch_manager/src/control_client/src/control_client.cpp @@ -30,7 +30,9 @@ inline score::concurrency::InterruptibleFuture GetErrorFuture(ExecErrc err } ControlClient::ControlClient() noexcept { - static std::function undefinedStateCallback = [](const score::lcm::ExecutionErrorEvent& event) {}; + static std::function undefinedStateCallback = + [](const score::lcm::ExecutionErrorEvent& event) { (void) event; }; + try { control_client_impl_ = std::make_unique(undefinedStateCallback); } catch (...) { diff --git a/score/launch_manager/src/control_client/src/details/BUILD b/score/launch_manager/src/control_client/src/details/BUILD index 9f1fdf825..a525740c9 100644 --- a/score/launch_manager/src/control_client/src/details/BUILD +++ b/score/launch_manager/src/control_client/src/details/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "control_client_impl", srcs = [ "control_client_impl.cpp", diff --git a/score/launch_manager/src/daemon/BUILD b/score/launch_manager/src/daemon/BUILD index 3dd29afdc..7d421125c 100644 --- a/score/launch_manager/src/daemon/BUILD +++ b/score/launch_manager/src/daemon/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") -cc_binary( +cc_binary_with_common_options( name = "launch_manager", srcs = ["src/main.cpp"], linkopts = select({ diff --git a/score/launch_manager/src/daemon/src/alive_monitor/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/BUILD index 8bea5e726..8f13821ee 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "alive_monitor", visibility = ["//score:__subpackages__"], deps = [ diff --git a/score/launch_manager/src/daemon/src/alive_monitor/config/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/config/BUILD index 445fefe29..e09a12a39 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/config/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/config/BUILD @@ -10,7 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* + load("@score_baselibs//score/flatbuffers/bazel:codegen.bzl", "generate_cpp") +load("//config:common_cc.bzl", "cc_library_with_common_options") exports_files( [ @@ -34,7 +36,7 @@ generate_cpp( visibility = ["//visibility:private"], ) -cc_library( +cc_library_with_common_options( name = "config", hdrs = [ ":hm_config", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD index a3d347d89..6ff84287d 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "types", hdrs = ["Types.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", @@ -20,7 +20,7 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "observer", hdrs = ["Observer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", @@ -29,7 +29,7 @@ cc_library( deps = ["@score_baselibs//score/language/futurecpp"], ) -cc_library( +cc_library_with_common_options( name = "fixed_size_vector", hdrs = ["FixedSizeVector.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", @@ -37,7 +37,7 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "locked_vector", hdrs = ["LockedVector.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", @@ -46,7 +46,7 @@ cc_library( deps = [":fixed_size_vector"], ) -cc_library( +cc_library_with_common_options( name = "time_sorting_buffer", hdrs = ["TimeSortingBuffer.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/common", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD index 3f77a1649..b5593da10 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "phm_daemon_config", hdrs = ["PhmDaemonConfig.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon", @@ -20,7 +20,7 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "sw_cluster_handler", srcs = ["SwClusterHandler.cpp"], hdrs = ["SwClusterHandler.hpp"], @@ -41,7 +41,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "phm_daemon", srcs = ["PhmDaemon.cpp"], hdrs = ["PhmDaemon.hpp"], @@ -66,7 +66,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "i_health_monitor", hdrs = ["IAliveMonitor.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/daemon", @@ -75,7 +75,7 @@ cc_library( deps = [":phm_daemon"], ) -cc_library( +cc_library_with_common_options( name = "health_monitor_impl", srcs = ["AliveMonitorImpl.cpp"], hdrs = ["AliveMonitorImpl.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD index 82187ef53..abba598e9 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "i_phm_factory", hdrs = ["IPhmFactory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", @@ -23,7 +23,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "static_config", hdrs = ["StaticConfig.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/factory", @@ -36,7 +36,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "machine_config_factory", srcs = ["MachineConfigFactory.cpp"], hdrs = ["MachineConfigFactory.hpp"], @@ -58,7 +58,7 @@ cc_library( }), ) -cc_library( +cc_library_with_common_options( name = "flat_cfg_factory", srcs = ["FlatCfgFactory.cpp"], hdrs = ["FlatCfgFactory.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp index bc4832003..33f95f057 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/FlatCfgFactory.cpp @@ -42,7 +42,7 @@ namespace { /// @brief Prefix for all log messages // coverity[autosar_cpp14_a2_10_4_violation:FALSE] Empty namespace ensures uniqueness for cpp file scope -static constexpr const char* kLogPrefix{"Factory for FlatCfg AR24-11:"}; +static constexpr const std::string_view kLogPrefix{"Factory for FlatCfg AR24-11:"}; std::unique_ptr read_flatbuffer_file(const std::string& f_filename_r) { diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp index 910a934ee..4546c2c5c 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/MachineConfigFactory.cpp @@ -34,7 +34,7 @@ namespace { /// @brief Prefix for all log messages // coverity[autosar_cpp14_a2_10_4_violation:FALSE] Empty namespace ensures uniqueness for cpp file scope -static constexpr const char* kLogPrefix{"Factory for FlatCfg MachineConfig:"}; +static constexpr const std::string_view kLogPrefix{"Factory for FlatCfg MachineConfig:"}; /// @brief Update a field in case the provided value is not the flatbuffer default value /// @note In case of optional integer values in flatbuffer files, the flatbuffer API will just return 0 if the value was diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD index 32c531645..771af6928 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ifappl/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "data_structures", hdrs = ["DataStructures.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/ifappl", @@ -27,7 +27,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "checkpoint", srcs = ["Checkpoint.cpp"], hdrs = ["Checkpoint.hpp"], @@ -41,7 +41,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "monitor_if_daemon", srcs = ["MonitorIfDaemon.cpp"], hdrs = ["MonitorIfDaemon.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD index 9e3c1836f..e65afef47 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ifexm/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "process_cfg", srcs = [], hdrs = ["ProcessCfg.hpp"], @@ -24,7 +24,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "process_state", srcs = ["ProcessState.cpp"], hdrs = ["ProcessState.hpp"], @@ -40,7 +40,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "process_state_reader", srcs = ["ProcessStateReader.cpp"], hdrs = ["ProcessStateReader.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD index 083fee615..82a64a818 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/ipc/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "ipc_if", hdrs = [ "IpcBase.hpp", diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD index 0a0547059..1566ed47a 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/logging/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "phm_logging", srcs = ["PhmLogger.cpp"], hdrs = ["PhmLogger.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD index 626725bf1..1b245ec99 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/supervision/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "supervision_cfg", hdrs = ["SupervisionCfg.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/supervision", @@ -25,7 +25,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "i_supervision", srcs = ["ISupervision.cpp"], hdrs = ["ISupervision.hpp"], @@ -37,7 +37,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "alive", srcs = ["Alive.cpp"], hdrs = ["Alive.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD index 4e5733631..ee85dafe3 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "os_clock_interface", hdrs = ["OsClockInterface.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/timers", @@ -20,7 +20,7 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "timers_os_clock", srcs = [ "TimeConversion.cpp", @@ -44,7 +44,7 @@ alias( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "cycle_time_validator", srcs = ["CycleTimeValidator.cpp"], hdrs = ["CycleTimeValidator.hpp"], @@ -54,7 +54,7 @@ cc_library( deps = [":os_clock_interface"], ) -cc_library( +cc_library_with_common_options( name = "cycle_timer", srcs = ["CycleTimer.cpp"], hdrs = ["CycleTimer.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD index 7b52366f4..8f19c4f6b 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "i_device_config_factory", hdrs = ["IDeviceConfigFactory.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", @@ -20,7 +20,7 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "i_watchdog_if", hdrs = ["IWatchdogIf.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", @@ -29,7 +29,7 @@ cc_library( deps = [":i_device_config_factory"], ) -cc_library( +cc_library_with_common_options( name = "watchdog", hdrs = ["Watchdog.hpp"], include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog", @@ -37,7 +37,7 @@ cc_library( visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "device_if", srcs = ["DeviceIf.cpp"], hdrs = ["DeviceIf.hpp"], @@ -47,7 +47,7 @@ cc_library( deps = ["@score_baselibs//score/language/futurecpp"], ) -cc_library( +cc_library_with_common_options( name = "watchdog_impl", srcs = ["WatchdogImpl.cpp"], hdrs = ["WatchdogImpl.hpp"], diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp index 31beafc1d..d230e2a30 100644 --- a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp +++ b/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp @@ -93,7 +93,7 @@ bool WatchdogImpl::init(std::int64_t f_cycleTimeInNs, const IDeviceConfigFactory { isSuccess = false; watchdogDevices.clear(); - logger_r.LogError() << "Watchdog: Watchdog initialization failed:" << e.what(); + logger_r.LogError() << "Watchdog: Watchdog initialization failed:" << std::string(e.what()); } return isSuccess; } diff --git a/score/launch_manager/src/daemon/src/common/BUILD b/score/launch_manager/src/daemon/src/common/BUILD index db23911e2..ee9ee92eb 100644 --- a/score/launch_manager/src/daemon/src/common/BUILD +++ b/score/launch_manager/src/daemon/src/common/BUILD @@ -11,9 +11,9 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_test") -load("//config:common_cc.bzl", "cc_binary_with_common_opts", "cc_library_with_common_opts") +load("//config:common_cc.bzl", "cc_binary_with_common_options", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "identifier_hash", srcs = [ "identifier_hash.cpp", @@ -35,7 +35,7 @@ cc_test( ], ) -cc_library( +cc_library_with_common_options( name = "log", hdrs = ["log.hpp"], defines = select({ @@ -51,7 +51,7 @@ cc_library( }), ) -cc_library( +cc_library_with_common_options( name = "constants", hdrs = ["constants.hpp"], include_prefix = "score/mw/launch_manager/common", @@ -62,7 +62,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "process_group_state_id", hdrs = [ "process_group_state_id.hpp", diff --git a/score/launch_manager/src/daemon/src/common/concurrency/BUILD b/score/launch_manager/src/daemon/src/common/concurrency/BUILD index c17d3a7b6..de875099d 100644 --- a/score/launch_manager/src/daemon/src/common/concurrency/BUILD +++ b/score/launch_manager/src/daemon/src/common/concurrency/BUILD @@ -10,9 +10,11 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -cc_library( +load("@rules_cc//cc:defs.bzl", "cc_test") +load("//config:common_cc.bzl", "cc_binary_with_common_options", "cc_library_with_common_options") + +cc_library_with_common_options( name = "workerthread", hdrs = ["workerthread.hpp"], include_prefix = "score/mw/launch_manager/common/concurrency", @@ -25,7 +27,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "mpmc_concurrent_queue", hdrs = [ "concurrency_error_domain.hpp", @@ -49,7 +51,7 @@ cc_library( ], ) -cc_binary( +cc_binary_with_common_options( name = "mpmc_concurrent_queue_benchmark", srcs = ["mpmc_concurrent_queue_benchmark.cpp"], deps = [ diff --git a/score/launch_manager/src/daemon/src/common/concurrency/details/BUILD b/score/launch_manager/src/daemon/src/common/concurrency/details/BUILD index a4a517f98..c49f38152 100644 --- a/score/launch_manager/src/daemon/src/common/concurrency/details/BUILD +++ b/score/launch_manager/src/daemon/src/common/concurrency/details/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "helgrind_annotations", hdrs = ["helgrind_annotations.hpp"], include_prefix = "score/mw/launch_manager/common/concurrency/details", diff --git a/score/launch_manager/src/daemon/src/configuration/BUILD b/score/launch_manager/src/daemon/src/configuration/BUILD index 140934e1d..92023596a 100644 --- a/score/launch_manager/src/daemon/src/configuration/BUILD +++ b/score/launch_manager/src/daemon/src/configuration/BUILD @@ -10,8 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") + load("@score_baselibs//score/flatbuffers/bazel:codegen.bzl", "generate_cpp") +load("//config:common_cc.bzl", "cc_library_with_common_options") filegroup( name = "new_lm_flatcfg_fbs", @@ -25,7 +26,7 @@ generate_cpp( schema = "details/new_lm_flatcfg.fbs", ) -cc_library( +cc_library_with_common_options( name = "config", srcs = ["details/config.cpp"], hdrs = ["config.hpp"], @@ -45,7 +46,7 @@ cc_test( ], ) -cc_library( +cc_library_with_common_options( name = "config_loader", hdrs = ["config_loader.hpp"], include_prefix = "score/mw/launch_manager/configuration", @@ -58,7 +59,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "flatbuffer_type_converters", srcs = [ "details/flatbuffer_type_converters.cpp", @@ -74,7 +75,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "flatbuffer_config_loader", srcs = [ "details/flatbuffer_config_loader.cpp", @@ -116,7 +117,7 @@ cc_test( ], ) -cc_library( +cc_library_with_common_options( name = "configuration_manager", srcs = ["configuration_manager.cpp"], hdrs = ["configuration_manager.hpp"], diff --git a/score/launch_manager/src/daemon/src/configuration/config_schema/BUILD b/score/launch_manager/src/daemon/src/configuration/config_schema/BUILD index 7b40dd4a1..56e828d6f 100644 --- a/score/launch_manager/src/daemon/src/configuration/config_schema/BUILD +++ b/score/launch_manager/src/daemon/src/configuration/config_schema/BUILD @@ -10,8 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") + load("@score_baselibs//score/flatbuffers/bazel:codegen.bzl", "generate_cpp") +load("//config:common_cc.bzl", "cc_library_with_common_options") exports_files( [ @@ -34,7 +35,7 @@ generate_cpp( visibility = ["//visibility:private"], ) -cc_library( +cc_library_with_common_options( name = "config_schema", hdrs = [":fbs_config"], include_prefix = "score/mw/launch_manager/configuration", diff --git a/score/launch_manager/src/daemon/src/configuration/configuration_manager.cpp b/score/launch_manager/src/daemon/src/configuration/configuration_manager.cpp index bf99f7008..76ddb8508 100644 --- a/score/launch_manager/src/daemon/src/configuration/configuration_manager.cpp +++ b/score/launch_manager/src/daemon/src/configuration/configuration_manager.cpp @@ -765,7 +765,7 @@ bool ConfigurationManager::checkOrSetFlatConfigEnvVar(const std::string& name, c if (setenv(name.c_str(), path.c_str(), overwrite_) == 0) { result = true; } else { - LM_LOG_DEBUG() << name.c_str() << "not set, so default flat config binary path loaded"; + LM_LOG_DEBUG() << name << "not set, so default flat config binary path loaded"; } } diff --git a/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp index fa7025cfa..aa4ed0eec 100644 --- a/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.cpp @@ -35,7 +35,7 @@ namespace template score::cpp::expected requireScalarValue(const ::flatbuffers::Optional& field, - const char* field_name) + const std::string_view field_name) { if (!field.has_value()) { diff --git a/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp index 5273f8c26..f1a478586 100644 --- a/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp +++ b/score/launch_manager/src/daemon/src/configuration/details/flatbuffer_type_converters.hpp @@ -38,7 +38,7 @@ namespace details // --- Range validation --- template -score::cpp::expected validateRange(int64_t value, const char* field_name) +score::cpp::expected validateRange(int64_t value, const std::string_view field_name) { // Asserts ensure that std::numeric_limits::min() and std::numeric_limits::max() can be // safely cast to int64_t for the range check: diff --git a/score/launch_manager/src/daemon/src/control/BUILD b/score/launch_manager/src/daemon/src/control/BUILD index 090ccec7d..41352d843 100644 --- a/score/launch_manager/src/daemon/src/control/BUILD +++ b/score/launch_manager/src/daemon/src/control/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "control_client_channel", srcs = [ "control_client_channel.cpp", diff --git a/score/launch_manager/src/daemon/src/osal/BUILD b/score/launch_manager/src/daemon/src/osal/BUILD index 8c4b45587..f0faac3d7 100644 --- a/score/launch_manager/src/daemon/src/osal/BUILD +++ b/score/launch_manager/src/daemon/src/osal/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "return_types", hdrs = ["return_types.hpp"], include_prefix = "score/mw/launch_manager/osal", @@ -20,7 +20,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "semaphore", srcs = ["details/posix/semaphore.cpp"], hdrs = [ @@ -33,7 +33,7 @@ cc_library( deps = [":return_types"], ) -cc_library( +cc_library_with_common_options( name = "sys_exit", srcs = ["details/posix/sys_exit.cpp"], hdrs = ["sys_exit.hpp"], @@ -42,7 +42,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "num_cores", srcs = select({ "@platforms//os:linux": ["details/linux/num_cores.cpp"], @@ -54,7 +54,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "security_policy", srcs = select({ "@platforms//os:linux": ["details/linux/security_policy.cpp"], @@ -66,7 +66,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "set_affinity", srcs = select({ "@platforms//os:linux": ["details/linux/set_affinity.cpp"], @@ -78,7 +78,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "set_groups", srcs = select({ "@platforms//os:linux": ["details/linux/set_groups.cpp"], @@ -90,7 +90,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "ipc_comms", hdrs = [ "ipc_comms.hpp", @@ -109,7 +109,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "osal", visibility = ["//score:__subpackages__"], deps = [ diff --git a/score/launch_manager/src/daemon/src/process_group_manager/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/BUILD index 4faa2b991..d43f6effd 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/BUILD +++ b/score/launch_manager/src/daemon/src/process_group_manager/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "iprocess", hdrs = ["iprocess.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", @@ -24,7 +24,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "ialive_monitor_thread", hdrs = ["ialive_monitor_thread.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", @@ -32,7 +32,7 @@ cc_library( visibility = ["//score:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "alive_monitor_thread", srcs = ["alive_monitor_thread.cpp"], hdrs = ["alive_monitor_thread.hpp"], @@ -47,7 +47,7 @@ cc_library( # Header-only target for process_group_manager.hpp; used by details:process_group_manager_impl # to break the circular header dependency without creating a Bazel cycle. -cc_library( +cc_library_with_common_options( name = "process_group_manager_hdrs", hdrs = ["process_group_manager.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", @@ -72,7 +72,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "process_group_manager", visibility = ["//score:__subpackages__"], deps = [ diff --git a/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD index f5188d441..c8e4eef49 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD +++ b/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "process_info_node", hdrs = ["process_info_node.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager/details", @@ -28,7 +28,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "graph", hdrs = ["graph.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager/details", @@ -45,7 +45,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "safe_process_map", srcs = ["safe_process_map.cpp"], hdrs = ["safe_process_map.hpp"], @@ -67,7 +67,7 @@ cc_test( ], ) -cc_library( +cc_library_with_common_options( name = "os_handler", srcs = ["os_handler.cpp"], hdrs = ["os_handler.hpp"], @@ -93,7 +93,7 @@ cc_test( ], ) -cc_library( +cc_library_with_common_options( name = "process_launcher", srcs = ["process_launcher.cpp"], visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], @@ -112,7 +112,7 @@ cc_library( # graph.cpp, process_info_node.cpp, and process_group_manager.cpp include # process_group_manager.hpp which in turn includes graph.hpp and process_info_node.hpp — # circular at link time, so all three must share a target. -cc_library( +cc_library_with_common_options( name = "process_group_manager_impl", srcs = [ "graph.cpp", diff --git a/score/launch_manager/src/daemon/src/process_state_client/BUILD b/score/launch_manager/src/daemon/src/process_state_client/BUILD index 368838fd6..7728ecd95 100644 --- a/score/launch_manager/src/daemon/src/process_state_client/BUILD +++ b/score/launch_manager/src/daemon/src/process_state_client/BUILD @@ -10,9 +10,11 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") -cc_library( +load("@rules_cc//cc:defs.bzl", "cc_test") +load("//config:common_cc.bzl", "cc_library_with_common_options") + +cc_library_with_common_options( name = "posix_process", hdrs = ["posix_process.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", @@ -23,7 +25,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "iprocess_state_receiver", hdrs = ["iprocess_state_receiver.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", @@ -36,7 +38,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "iprocess_state_notifier", hdrs = ["iprocess_state_notifier.hpp"], include_prefix = "score/mw/launch_manager/process_state_client", @@ -48,7 +50,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "process_state_notifier", srcs = ["process_state_notifier.cpp"], hdrs = ["process_state_notifier.hpp"], @@ -63,7 +65,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "process_state_client", visibility = ["//score:__subpackages__"], deps = [ diff --git a/score/launch_manager/src/daemon/src/process_state_client/details/BUILD b/score/launch_manager/src/daemon/src/process_state_client/details/BUILD index b002d0690..e7b756947 100644 --- a/score/launch_manager/src/daemon/src/process_state_client/details/BUILD +++ b/score/launch_manager/src/daemon/src/process_state_client/details/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "process_state_receiver", srcs = ["process_state_receiver.cpp"], hdrs = ["process_state_receiver.hpp"], diff --git a/score/launch_manager/src/daemon/src/process_state_client/process_state_client_ut.cpp b/score/launch_manager/src/daemon/src/process_state_client/process_state_client_ut.cpp index 7fd561ac8..f99da5305 100644 --- a/score/launch_manager/src/daemon/src/process_state_client/process_state_client_ut.cpp +++ b/score/launch_manager/src/daemon/src/process_state_client/process_state_client_ut.cpp @@ -58,6 +58,7 @@ TEST_F(ProcessStateClient_UT, ProcessStateClient_QueueOneProcess_Succeeds) .id = score::lcm::IdentifierHash("Process1"), .processStateId = score::lcm::ProcessState::kRunning, .processGroupStateId = score::lcm::IdentifierHash("PGState1"), + .systemClockTimestamp = {}, }; // Queue one process @@ -91,6 +92,7 @@ TEST_F(ProcessStateClient_UT, ProcessStateClient_QueueMaxNumberOfProcesses_Succe .id = score::lcm::IdentifierHash("Process" + std::to_string(i)), .processStateId = score::lcm::ProcessState::kRunning, .processGroupStateId = score::lcm::IdentifierHash("PGState" + std::to_string(i)), + .systemClockTimestamp = {}, }; bool queued = notifier_->queuePosixProcess(process); ASSERT_TRUE(queued) << "Failed to queue process at index " << i; @@ -121,6 +123,7 @@ TEST_F(ProcessStateClient_UT, ProcessStateClient_QueueOneProcessTooMany_Fails) .id = score::lcm::IdentifierHash("Process1"), .processStateId = score::lcm::ProcessState::kRunning, .processGroupStateId = score::lcm::IdentifierHash("PGState1"), + .systemClockTimestamp = {}, }; // Fill the buffer to capacity @@ -130,6 +133,7 @@ TEST_F(ProcessStateClient_UT, ProcessStateClient_QueueOneProcessTooMany_Fails) .id = score::lcm::IdentifierHash("Process" + std::to_string(i)), .processStateId = score::lcm::ProcessState::kRunning, .processGroupStateId = score::lcm::IdentifierHash("PGState" + std::to_string(i)), + .systemClockTimestamp = {}, }; bool queued = notifier_->queuePosixProcess(proc); ASSERT_TRUE(queued) << "Failed to queue process at index " << i; diff --git a/score/launch_manager/src/daemon/src/recovery_client/BUILD b/score/launch_manager/src/daemon/src/recovery_client/BUILD index 0944da271..a82b546ea 100644 --- a/score/launch_manager/src/daemon/src/recovery_client/BUILD +++ b/score/launch_manager/src/daemon/src/recovery_client/BUILD @@ -10,9 +10,11 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") -cc_library( +load("@rules_cc//cc:defs.bzl", "cc_test") +load("//config:common_cc.bzl", "cc_library_with_common_options") + +cc_library_with_common_options( name = "recovery_client", srcs = [ "recovery_client.cpp", diff --git a/score/launch_manager/src/lifecycle_client/BUILD b/score/launch_manager/src/lifecycle_client/BUILD index 72a9c9cc7..07776bb7f 100644 --- a/score/launch_manager/src/lifecycle_client/BUILD +++ b/score/launch_manager/src/lifecycle_client/BUILD @@ -10,10 +10,11 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") + load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "lifecycle_client", include_prefix = "score/mw/lifecycle", strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src", @@ -27,7 +28,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "applicationcontext", srcs = [ "src/applicationcontext.cpp", @@ -48,7 +49,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "application", srcs = [ "src/application.cpp", @@ -66,7 +67,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "aasapplicationcontainer", srcs = [ "src/aasapplicationcontainer.cpp", @@ -86,7 +87,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "lifecyclemanager", srcs = [ "src/lifecyclemanager.cpp", @@ -110,7 +111,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "runapplication", srcs = [ "src/runapplication.cpp", @@ -134,7 +135,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "report_running", srcs = ["src/report_running.cpp"], hdrs = ["src/report_running.h"], @@ -148,7 +149,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "applicationcontext_mock", testonly = True, srcs = [ @@ -169,7 +170,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "lifecycle_mock", testonly = True, srcs = [ @@ -192,7 +193,7 @@ cc_library( ], ) -cc_library( +cc_library_with_common_options( name = "report_running_mock", testonly = True, srcs = ["src/report_running_mock.cpp"], diff --git a/score/launch_manager/src/lifecycle_client/src/details/BUILD b/score/launch_manager/src/lifecycle_client/src/details/BUILD index 539fefca7..d2b672a26 100644 --- a/score/launch_manager/src/lifecycle_client/src/details/BUILD +++ b/score/launch_manager/src/lifecycle_client/src/details/BUILD @@ -10,9 +10,9 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_library_with_common_options") -cc_library( +cc_library_with_common_options( name = "report_running_impl", srcs = ["report_running_impl.cpp"], hdrs = ["report_running_impl.hpp"], diff --git a/tests/integration/complex_monitoring/BUILD b/tests/integration/complex_monitoring/BUILD index 0ce8d5bf1..a3fdaf216 100644 --- a/tests/integration/complex_monitoring/BUILD +++ b/tests/integration/complex_monitoring/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ @@ -24,7 +24,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "component_complex_monitoring", srcs = ["component_complex_monitoring.cpp"], linkopts = select({ diff --git a/tests/integration/complex_monitoring/component_complex_monitoring.cpp b/tests/integration/complex_monitoring/component_complex_monitoring.cpp index 441cb583d..dd134d8ed 100644 --- a/tests/integration/complex_monitoring/component_complex_monitoring.cpp +++ b/tests/integration/complex_monitoring/component_complex_monitoring.cpp @@ -63,7 +63,7 @@ TEST(ComplexMonitoring, ComponentComplexMonitoring) // When heartbeats are no longer sent... } -int main(int argc, char** argv) +int main() { TestRunner(__FILE__, TerminationBehavior::kContinue).RunTests(); // Then expect kill due to recovery action (verified by control client) diff --git a/tests/integration/complex_monitoring/control_client_mock.cpp b/tests/integration/complex_monitoring/control_client_mock.cpp index c83bb537f..b0046c457 100644 --- a/tests/integration/complex_monitoring/control_client_mock.cpp +++ b/tests/integration/complex_monitoring/control_client_mock.cpp @@ -17,18 +17,17 @@ #include #include - TEST(ComplexMonitoring, ControlClientMock) { score::mw::lifecycle::ControlClient client; - + ASSERT_TRUE(check_clean({test_end_location, fallback_file})); TEST_STEP("Report running") { score::mw::lifecycle::report_running(); } - + TEST_STEP("Launch monitored process") { score::cpp::stop_token stop_token; @@ -49,7 +48,7 @@ TEST(ComplexMonitoring, ControlClientMock) } } -int main(int argc, char** argv) +int main() { return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests(); } diff --git a/tests/integration/crash_on_startup/BUILD b/tests/integration/crash_on_startup/BUILD index 1a74dcca7..0723a7e90 100644 --- a/tests/integration/crash_on_startup/BUILD +++ b/tests/integration/crash_on_startup/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ @@ -24,7 +24,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "process_crashing_on_startup_twice", srcs = ["process_crashing_on_startup_twice.cpp"], deps = [ @@ -34,7 +34,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "process_crashing_on_startup_always", srcs = ["process_crashing_on_startup_always.cpp"], ) diff --git a/tests/integration/crash_on_startup/control_client_mock.cpp b/tests/integration/crash_on_startup/control_client_mock.cpp index c0dcd1be0..abc39de30 100644 --- a/tests/integration/crash_on_startup/control_client_mock.cpp +++ b/tests/integration/crash_on_startup/control_client_mock.cpp @@ -17,11 +17,10 @@ #include #include - TEST(CrashOnStartup, ControlClientMock) { score::mw::lifecycle::ControlClient client; - + ASSERT_TRUE(check_clean({crashed_once_file, crashed_twice_file, test_end_location, fallback_file})); TEST_STEP("Report running") @@ -65,7 +64,7 @@ TEST(CrashOnStartup, ControlClientMock) } } -int main(int argc, char** argv) +int main() { return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests(); } diff --git a/tests/integration/incorrect_config_non_reporting/BUILD b/tests/integration/incorrect_config_non_reporting/BUILD index d84b30f28..e7bad63e1 100644 --- a/tests/integration/incorrect_config_non_reporting/BUILD +++ b/tests/integration/incorrect_config_non_reporting/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "non_reporting_process", srcs = ["non_reporting_process.cpp"], deps = [ diff --git a/tests/integration/process_complex_rep_failure/BUILD b/tests/integration/process_complex_rep_failure/BUILD index 478e2370e..137596cf2 100644 --- a/tests/integration/process_complex_rep_failure/BUILD +++ b/tests/integration/process_complex_rep_failure/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ @@ -24,7 +24,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "complex_reporting_process", srcs = ["//tests/utils/test_helper:complex_reporting_process.cpp"], visibility = ["//tests:__subpackages__"], diff --git a/tests/integration/process_complex_rep_failure/control_client_mock.cpp b/tests/integration/process_complex_rep_failure/control_client_mock.cpp index b505ee0be..e764ca918 100644 --- a/tests/integration/process_complex_rep_failure/control_client_mock.cpp +++ b/tests/integration/process_complex_rep_failure/control_client_mock.cpp @@ -76,7 +76,7 @@ TEST(RecoveryActionComplexRepFailure, ControlClientMock) { TEST_STEP("Activate RunTarget Off") { client.ActivateRunTarget("Off"); } } -int main(int argc, char **argv) { +int main() { return TestRunner(__FILE__, TerminationBehavior::kContinue, TerminationNotification::kTestEnd) .RunTests(); diff --git a/tests/integration/process_crash_monitoring/BUILD b/tests/integration/process_crash_monitoring/BUILD index 0c8749bde..cbf21fa5c 100644 --- a/tests/integration/process_crash_monitoring/BUILD +++ b/tests/integration/process_crash_monitoring/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ @@ -24,7 +24,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "process_crashing_on_runtime", srcs = ["process_crashing_on_runtime.cpp"], deps = [ diff --git a/tests/integration/process_crash_monitoring/control_client_mock.cpp b/tests/integration/process_crash_monitoring/control_client_mock.cpp index 56df732f1..8618aa7b5 100644 --- a/tests/integration/process_crash_monitoring/control_client_mock.cpp +++ b/tests/integration/process_crash_monitoring/control_client_mock.cpp @@ -64,7 +64,7 @@ TEST(ProcessCrashMonitoring, ControlClientMock) } } -int main(int argc, char** argv) +int main() { return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests(); } diff --git a/tests/integration/process_fd_leak/BUILD b/tests/integration/process_fd_leak/BUILD index 13fdbb029..b69ab0485 100644 --- a/tests/integration/process_fd_leak/BUILD +++ b/tests/integration/process_fd_leak/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "native", srcs = [ "get_fds.hpp", @@ -26,7 +26,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "reporting", srcs = [ "get_fds.hpp", @@ -39,7 +39,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "control_client", srcs = [ "control_client.cpp", diff --git a/tests/integration/process_launch_args/BUILD b/tests/integration/process_launch_args/BUILD index 279ba3a61..006d3dea1 100644 --- a/tests/integration/process_launch_args/BUILD +++ b/tests/integration/process_launch_args/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "process_initial", srcs = ["process_initial.cpp"], deps = [ diff --git a/tests/integration/process_simple_rep_failure/BUILD b/tests/integration/process_simple_rep_failure/BUILD index 113a28f4d..edf3aabc2 100644 --- a/tests/integration/process_simple_rep_failure/BUILD +++ b/tests/integration/process_simple_rep_failure/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ @@ -24,7 +24,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "process_simple_reporting", srcs = ["process_simple_reporting.cpp"], deps = [ diff --git a/tests/integration/process_simple_rep_failure/control_client_mock.cpp b/tests/integration/process_simple_rep_failure/control_client_mock.cpp index a30ca8b24..10203fba4 100644 --- a/tests/integration/process_simple_rep_failure/control_client_mock.cpp +++ b/tests/integration/process_simple_rep_failure/control_client_mock.cpp @@ -76,7 +76,7 @@ TEST(RecoveryActionSimpleRepFailure, ControlClientMock) { TEST_STEP("Activate RunTarget Off") { client.ActivateRunTarget("Off"); } } -int main(int argc, char **argv) { +int main() { return TestRunner(__FILE__, TerminationBehavior::kContinue, TerminationNotification::kTestEnd) .RunTests(); diff --git a/tests/integration/process_wrong_binary_failure/BUILD b/tests/integration/process_wrong_binary_failure/BUILD index d5b5aee22..6604a563f 100644 --- a/tests/integration/process_wrong_binary_failure/BUILD +++ b/tests/integration/process_wrong_binary_failure/BUILD @@ -10,10 +10,10 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ diff --git a/tests/integration/process_wrong_binary_failure/control_client_mock.cpp b/tests/integration/process_wrong_binary_failure/control_client_mock.cpp index 5dfbb353b..50a9220d0 100644 --- a/tests/integration/process_wrong_binary_failure/control_client_mock.cpp +++ b/tests/integration/process_wrong_binary_failure/control_client_mock.cpp @@ -46,7 +46,7 @@ TEST(MissingBinaryFailure, ControlClientMock) } } -int main(int argc, char** argv) +int main() { return TestRunner(__FILE__, TerminationBehavior::kContinue, TerminationNotification::kTestEnd).RunTests(); } diff --git a/tests/integration/smoke/BUILD b/tests/integration/smoke/BUILD index 506497c00..8337e85da 100644 --- a/tests/integration/smoke/BUILD +++ b/tests/integration/smoke/BUILD @@ -10,7 +10,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("//config:common_cc.bzl", "cc_binary_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") exports_files( @@ -18,7 +18,7 @@ exports_files( visibility = ["//examples:__subpackages__"], ) -cc_binary( +cc_binary_with_common_options( name = "control_daemon_mock", srcs = ["control_daemon_mock.cpp"], data = [], @@ -30,7 +30,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "gtest_process", srcs = ["gtest_process.cpp"], deps = [ diff --git a/tests/integration/smoke/control_daemon_mock.cpp b/tests/integration/smoke/control_daemon_mock.cpp index 7e6484bf9..6c54ceaf9 100644 --- a/tests/integration/smoke/control_daemon_mock.cpp +++ b/tests/integration/smoke/control_daemon_mock.cpp @@ -47,7 +47,7 @@ TEST(Smoke, Daemon) } } -int main(int argc, char** argv) +int main() { return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests(); } diff --git a/tests/integration/switch_run_target/BUILD b/tests/integration/switch_run_target/BUILD index 714a09b60..eff08298b 100644 --- a/tests/integration/switch_run_target/BUILD +++ b/tests/integration/switch_run_target/BUILD @@ -10,16 +10,15 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@rules_cc//cc:cc_binary.bzl", "cc_binary") -load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("//config:common_cc.bzl", "cc_binary_with_common_options", "cc_library_with_common_options") load("//tests/utils/bazel:integration.bzl", "integration_test") -cc_library( +cc_library_with_common_options( name = "switch_run_target_common", hdrs = ["common.hpp"], ) -cc_binary( +cc_binary_with_common_options( name = "control_client_mock", srcs = ["control_client_mock.cpp"], deps = [ @@ -32,7 +31,7 @@ cc_binary( ) [ - cc_binary( + cc_binary_with_common_options( name = component, srcs = [component + ".cpp"], deps = [ @@ -49,7 +48,7 @@ cc_binary( ] ] -cc_binary( +cc_binary_with_common_options( name = "component_e", srcs = ["//tests/utils/test_helper:reporting_process.cpp"], deps = [ diff --git a/tests/integration/switch_run_target/control_client_mock.cpp b/tests/integration/switch_run_target/control_client_mock.cpp index c349a828c..51708f125 100644 --- a/tests/integration/switch_run_target/control_client_mock.cpp +++ b/tests/integration/switch_run_target/control_client_mock.cpp @@ -73,7 +73,7 @@ TEST(SwitchRunTarget, ControlClientMock) } } -int main(int argc, char** argv) +int main() { return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests(); } diff --git a/tests/utils/test_helper/BUILD b/tests/utils/test_helper/BUILD index 85de2e91f..2cfcf331b 100644 --- a/tests/utils/test_helper/BUILD +++ b/tests/utils/test_helper/BUILD @@ -10,6 +10,8 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* +load("//config:common_cc.bzl", "cc_binary_with_common_options", "cc_library_with_common_options") + exports_files( # Export these to allow us to rename the binary if desired [ @@ -20,7 +22,7 @@ exports_files( visibility = ["//tests:__subpackages__"], ) -cc_library( +cc_library_with_common_options( name = "test_helper", hdrs = ["test_helper.hpp"], visibility = ["//tests:__subpackages__"], @@ -29,7 +31,7 @@ cc_library( ], ) -cc_binary( +cc_binary_with_common_options( name = "reporting_process", srcs = ["reporting_process.cpp"], visibility = ["//tests:__subpackages__"], @@ -40,7 +42,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "complex_reporting_process", srcs = ["complex_reporting_process.cpp"], visibility = ["//tests:__subpackages__"], @@ -51,7 +53,7 @@ cc_binary( ], ) -cc_binary( +cc_binary_with_common_options( name = "verification_process", srcs = ["verification_process.cpp"], visibility = ["//tests:__subpackages__"], diff --git a/tests/utils/test_helper/complex_reporting_process.cpp b/tests/utils/test_helper/complex_reporting_process.cpp index 31ee0e370..ba2af7488 100644 --- a/tests/utils/test_helper/complex_reporting_process.cpp +++ b/tests/utils/test_helper/complex_reporting_process.cpp @@ -31,12 +31,16 @@ class LifecycleApp final : public score::mw::lifecycle::Application { public: std::int32_t Initialize(const score::mw::lifecycle::ApplicationContext &appCtx) override { + (void) appCtx; + optind = 1; return 0; } std::int32_t Run(const score::cpp::stop_token &stopToken) override { + (void) stopToken; + return EXIT_SUCCESS; } };