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
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bazel_dep(name = "score_qnx_unit_tests", version = "0.2.0")
bazel_dep(name = "score_baselibs", version = "0.2.9")
git_override(
module_name = "score_baselibs",
commit = "8b26bb6faa1cf639adeeef73121edf02aae53aa1",
commit = "54d67260077a0e7cdf37faf4366ca3a72f35739f",
patch_strip = 1,
# Patch baselibs with a QNX8 workaround for poll
# until a fix is provided by the QNX SDP
Expand Down
9 changes: 9 additions & 0 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion module_integration_test/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bazel_dep(name = "rules_cc", version = "0.2.17")
bazel_dep(name = "score_baselibs", version = "0.2.9")
git_override(
module_name = "score_baselibs",
commit = "8b26bb6faa1cf639adeeef73121edf02aae53aa1",
commit = "54d67260077a0e7cdf37faf4366ca3a72f35739f",
patch_strip = 1,
# Patch baselibs with a QNX8 workaround for poll
# until a fix is provided by the QNX SDP
Expand Down
18 changes: 1 addition & 17 deletions score/message_passing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,15 @@
# *******************************************************************************

load("@rules_cc//cc:defs.bzl", "cc_library")
load("@score_baselibs//third_party/itf:py_unittest_qnx_test.bzl", "py_unittest_qnx_test")
load("@score_tooling//bazel/rules/rules_score:rules_score.bzl", "unit")
load("//quality/unit_testing:unit_testing.bzl", "cc_unit_test")
load("//score/mw:common_features.bzl", "COMPILER_WARNING_FEATURES")

py_unittest_qnx_test(
name = "unit_tests_qnx",
test_cases = [
":client_connection_test",
":qnx_dispatch_test",
":qnx_resource_path_test",
":timed_command_queue_test",
":unix_domain_test",
],
test_suites = [
"@score_communication//score/message_passing/log:log_test_qnx",
"@score_communication//score/message_passing/non_allocating_future:non_allocating_future_test_qnx",
],
visibility = ["//score/message_passing:__pkg__"],
)

test_suite(
name = "unit_tests",
tests = [
":client_connection_test",
":qnx_dispatch_test",
":qnx_resource_path_test",
":timed_command_queue_test",
":unix_domain_test",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ class MmanMock : public os::Mman
{
// mmap calls are uninteresting and are forwarded directly
return reinterpret_cast<os::internal::MmanImpl&>(
os::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
utils::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
.mmap(addr, length, protection, flags, fd, offset);
};

score::cpp::expected_blank<os::Error> munmap(void* addr, const std::size_t length) const noexcept override
{
// munmap calls are uninteresting and are forwarded directly
return reinterpret_cast<os::internal::MmanImpl&>(
os::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
utils::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
.munmap(addr, length);
};

Expand All @@ -114,15 +114,15 @@ class MmanMock : public os::Mman
std::strcpy(last_shm_open_path_, pathname);
shm_open_callcount_++;
return reinterpret_cast<os::internal::MmanImpl&>(
os::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
utils::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
.shm_open(pathname, oflag, mode);
};

score::cpp::expected_blank<os::Error> shm_unlink(const char* pathname) const noexcept override
{
// shm_unlink calls are uninteresting and are forwarded directly
return reinterpret_cast<os::internal::MmanImpl&>(
os::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
utils::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
.shm_unlink(pathname);
};

Expand All @@ -133,7 +133,7 @@ class MmanMock : public os::Mman
const os::Mman::PosixTypedMem tflag) const noexcept override
{
return reinterpret_cast<os::internal::MmanImpl&>(
os::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
utils::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
.posix_typed_mem_open(name, oflag, tflag);
}

Expand All @@ -142,7 +142,7 @@ class MmanMock : public os::Mman
struct posix_typed_mem_info* info) const noexcept override
{
return reinterpret_cast<os::internal::MmanImpl&>(
os::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
utils::StaticDestructionGuard<os::internal::MmanImpl>::GetStorage())
.posix_typed_mem_get_info(fd, info);
}

Expand Down
Loading