Skip to content
Draft
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
18 changes: 9 additions & 9 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ bazel_dep(name = "rules_python", version = "1.8.5")
bazel_dep(name = "rules_rust", version = "0.68.1-score")

# Cannot be dev-dependency due to being required in "load" statements
bazel_dep(name = "score_qnx_unit_tests", version = "0.1.0")
bazel_dep(name = "score_qnx_unit_tests", version = "0.2.0")
bazel_dep(name = "score_baselibs", version = "0.2.7")
git_override(
module_name = "score_baselibs",
# Required until a new release of baselibs is available that includes the tracing API
commit = "a0bae98d65bda42e02d3d5732a55895e1a66cdaa",
patch_strip = 1,
# Patch baselibs with a QNX8 workaround for poll
# until a fix is provided by the QNX SDP
patches = ["//third_party/score_baselibs:restore_qnx8_poll_workaround.patch"],
# patch_strip = 1,
# # Patch baselibs with a QNX8 workaround for poll
# # until a fix is provided by the QNX SDP
# patches = ["//third_party/score_baselibs:restore_qnx8_poll_workaround.patch"],
remote = "https://github.com/eclipse-score/baselibs.git",
)

Expand Down Expand Up @@ -81,7 +81,7 @@ gcc_toolchains.toolchain(
)
use_repo(gcc_toolchains, "gcc_toolchain_x86_64")

bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.1", dev_dependency = True)
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.4", dev_dependency = True)

score_gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
score_gcc.toolchain(
Expand All @@ -102,15 +102,15 @@ score_gcc.toolchain(
)
score_gcc.toolchain(
name = "score_qcc_x86_64_toolchain",
sdp_version = "8.0.3",
sdp_version = "8.0.4",
target_cpu = "x86_64",
target_os = "qnx",
use_default_package = True,
version = "12.2.0",
)
score_gcc.toolchain(
name = "score_qcc_aarch64_toolchain",
sdp_version = "8.0.3",
sdp_version = "8.0.4",
target_cpu = "aarch64",
target_os = "qnx",
use_default_package = True,
Expand Down Expand Up @@ -214,7 +214,7 @@ apt.install(
apt.lock(into = ":rules_distroless.lock.json")
use_repo(apt, "ubuntu24_04_integration_testing", "ubuntu24_04_sysroot")

bazel_dep(name = "toolchains_llvm", version = "1.5.0", dev_dependency = True)
bazel_dep(name = "toolchains_llvm", version = "1.8.0", dev_dependency = True)

llvm = use_extension(
"@toolchains_llvm//toolchain/extensions:llvm.bzl",
Expand Down
1 change: 1 addition & 0 deletions quality/unit_testing/unit_testing.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def cc_unit_test(name, target_compatible_with = [], tags = [], **kwargs):
cc_test_qnx(
name = name_qnx,
cc_test = name_linux,
tags = ["manual"],
)

_forwarding_test(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ TEST_F(MessagePassingServiceInstanceHandleMessageWithReplyTest, RepliesWithError

// When a MessageWithReply message is received which is empty
std::vector<std::uint8_t> empty_message(0U);
const auto result = received_send_message_with_reply_callback_(
std::ignore = received_send_message_with_reply_callback_(
server_connection_mock_, score::cpp::span<std::uint8_t>{empty_message.data(), empty_message.size()});
}

Expand Down Expand Up @@ -805,7 +805,7 @@ TEST_F(MessagePassingServiceInstanceHandleMessageWithReplyTest, RepliesWithError
// When a MessageWithReply message is received of unexpected type
std::vector<std::uint8_t> payload_with_unexpected_type(sizeof(MethodCallUnserializedPayload) + 2U);
payload_with_unexpected_type[0] = 20U;
const auto result = received_send_message_with_reply_callback_(
std::ignore = received_send_message_with_reply_callback_(
server_connection_mock_,
score::cpp::span<std::uint8_t>{payload_with_unexpected_type.data(), payload_with_unexpected_type.size()});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ using ::testing::_;
using ::testing::Return;

constexpr std::size_t kMaxSlots{5U};
constexpr std::size_t kMaxSubscribers{5U};

constexpr auto kSlotIsInWriting = std::numeric_limits<EventSlotStatus::SubscriberCount>::max();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct DummyStruct
};

constexpr std::size_t kMaxSlots{5U};
constexpr std::size_t kMaxSubscribers{5U};

class SampleAllocateePtrFixture : public ::testing::Test
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ TEST_F(SkeletonPrepareOfferFixture, PrepareOfferWillNotCallUnregisterSubscribedM
}));

// When calling PrepareOffer
const auto result = PrepareOffer();
std::ignore = PrepareOffer();

// Then UnregisterOnServiceMethodSubscribedHandler was not called during PrepareOffer
EXPECT_FALSE(*unregister_called);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,7 @@ TEST_F(TransactionLogSetRegisterFixture, RegisterUnregisterMultipleTransactionLo
// again.
for (std::size_t thread_idx = 0; thread_idx < thread_count; ++thread_idx)
{
threads.emplace_back([this,
&unit,
threads.emplace_back([&unit,
thread_number = TransactionLogIndex(thread_idx + 1U),
&consumer_event_data_control_locals,
thread_idx]() noexcept {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ const InstanceSpecifier kInstanceSpecifier =

void CallMethodWithInArgsAndReturn(NonTrivialConstructorProxy& proxy, const std::string& failure_message_prefix)
{
auto call_result =
[&proxy, &failure_message_prefix]() -> score::Result<impl::MethodReturnTypePtr<NonTriviallyConstructibleType>> {
auto call_result = [&proxy]() -> score::Result<impl::MethodReturnTypePtr<NonTriviallyConstructibleType>> {
std::cout << "\n=== Test: with_in_args_and_return (zero-copy) ===" << std::endl;
auto allocated_args_result = proxy.with_in_args_and_return.Allocate();
if (!allocated_args_result.has_value())
Expand Down Expand Up @@ -66,7 +65,7 @@ void CallMethodWithInArgsAndReturn(NonTrivialConstructorProxy& proxy, const std:

void CallMethodWithInArgsOnly(NonTrivialConstructorProxy& proxy, const std::string& failure_message_prefix)
{
auto call_result = [&proxy, &failure_message_prefix]() -> Result<void> {
auto call_result = [&proxy]() -> Result<void> {
std::cout << "\n=== Test: with_in_args_only (zero-copy) ===" << std::endl;
auto allocated_args_result = proxy.with_in_args_only.Allocate();
if (!allocated_args_result.has_value())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ constexpr auto kInstanceSpecifierString{"partial_restart/small_but_great"};
const auto kInstanceSpecifier =
score::mw::com::InstanceSpecifier::Create(std::string{kInstanceSpecifierString}).value();
const std::chrono::seconds kMaxHandleNotificationWaitTime{15U};
// uid 1312, 1313 is reserved for use. See broken_link_cf/display/ipnext/User+Management
const uid_t kUidFirstConsumer{1312};
const uid_t kUidSecondConsumer{1313};

bool StartFindServiceAndWait(const std::string& tag,
HandleNotificationData& handle_notification_data,
Expand Down
Loading