diff --git a/MODULE.bazel b/MODULE.bazel index 175533ad3..34894ba91 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -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 diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 106045a1a..5189801d4 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -24,6 +24,7 @@ "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85", "https://bcr.bazel.build/modules/apple_support/1.17.1/MODULE.bazel": "655c922ab1209978a94ef6ca7d9d43e940cd97d9c172fb55f94d91ac53f8610b", "https://bcr.bazel.build/modules/apple_support/1.22.1/MODULE.bazel": "90bd1a660590f3ceffbdf524e37483094b29352d85317060b2327fff8f3f4458", + "https://bcr.bazel.build/modules/apple_support/1.23.0/MODULE.bazel": "317d47e3f65b580e7fb4221c160797fda48e32f07d2dfff63d754ef2316dcd25", "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442", "https://bcr.bazel.build/modules/apple_support/1.24.1/MODULE.bazel": "f46e8ddad60aef170ee92b2f3d00ef66c147ceafea68b6877cb45bd91737f5f8", "https://bcr.bazel.build/modules/apple_support/1.24.1/source.json": "cf725267cbacc5f028ef13bb77e7f2c2e0066923a4dab1025e4a0511b1ed258a", @@ -228,6 +229,8 @@ "https://bcr.bazel.build/modules/curl/8.4.0/MODULE.bazel": "0bc250aa1cb69590049383df7a9537c809591fcf876c620f5f097c58fdc9bc10", "https://bcr.bazel.build/modules/curl/8.7.1/MODULE.bazel": "088221c35a2939c555e6e47cb31a81c15f8b59f4daa8009b1e9271a502d33485", "https://bcr.bazel.build/modules/curl/8.7.1/source.json": "bf9890e809717445b10a3ddc323b6d25c46631589c693a232df8310a25964484", + "https://bcr.bazel.build/modules/cxx.rs/1.0.186/MODULE.bazel": "af6d2cf790d198754250b1bf1dc36c671f2006ffff7ea1e19ee13972347ef16f", + "https://bcr.bazel.build/modules/cxx.rs/1.0.186/source.json": "6c30eb2ca366d9199343c00a5b49d5edcde0c72ee48f01c1017e19cc7bf210b5", "https://bcr.bazel.build/modules/cython/3.0.11-1/MODULE.bazel": "868b3f5c956c3657420d2302004c6bb92606bfa47e314bab7f2ba0630c7c966c", "https://bcr.bazel.build/modules/cython/3.0.11-1/source.json": "da318be900b8ca9c3d1018839d3bebc5a8e1645620d0848fa2c696d4ecf7c296", "https://bcr.bazel.build/modules/diff.bzl/0.5.1/MODULE.bazel": "bad8dd444e512b6fcbcd969d6385cd6bc093d4c12e5640fb1f0ace2282f99ef9", @@ -525,10 +528,12 @@ "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/source.json": "37c10335f2361c337c5c1f34ed36d2da70534c23088062b33a8bdaab68aa9dea", "https://bcr.bazel.build/modules/rules_rust/0.56.0/MODULE.bazel": "3295b00757db397122092322fe1e920be7f5c9fbfb8619138977e820f2cbbbae", "https://bcr.bazel.build/modules/rules_rust/0.61.0/MODULE.bazel": "0318a95777b9114c8740f34b60d6d68f9cfef61e2f4b52424ca626213d33787b", + "https://bcr.bazel.build/modules/rules_rust/0.65.0/MODULE.bazel": "1b53caef82fd1c89a2fb15cfa3a15a8e98fe12f4904806b409f5a0183e73f547", "https://bcr.bazel.build/modules/rules_rust/0.67.0/MODULE.bazel": "87c3816c4321352dcfd9e9e26b58e84efc5b21351ae3ef8fb5d0d57bde7237f5", "https://bcr.bazel.build/modules/rules_shell/0.1.2/MODULE.bazel": "66e4ca3ce084b04af0b9ff05ff14cab4e5df7503973818bb91cbc6cda08d32fc", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b", + "https://bcr.bazel.build/modules/rules_shell/0.4.0/MODULE.bazel": "0f8f11bb3cd11755f0b48c1de0bbcf62b4b34421023aa41a2fc74ef68d9584f0", "https://bcr.bazel.build/modules/rules_shell/0.4.1/MODULE.bazel": "00e501db01bbf4e3e1dd1595959092c2fadf2087b2852d3f553b5370f5633592", "https://bcr.bazel.build/modules/rules_shell/0.5.0/MODULE.bazel": "8c8447370594d45539f66858b602b0bb2cb2d3401a4ebb9ad25830c59c0f366d", "https://bcr.bazel.build/modules/rules_shell/0.6.1/MODULE.bazel": "72e76b0eea4e81611ef5452aa82b3da34caca0c8b7b5c0c9584338aa93bae26b", @@ -600,6 +605,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/apple_support/1.15.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/apple_support/1.17.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/apple_support/1.22.1/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/apple_support/1.23.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/apple_support/1.23.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/apple_support/1.24.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/aspect_bazel_lib/1.31.2/MODULE.bazel": "not found", @@ -739,6 +745,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/civetweb/1.16/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/curl/8.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/curl/8.7.1/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/cxx.rs/1.0.186/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/cython/3.0.11-1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/diff.bzl/0.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/download_utils/1.0.1/MODULE.bazel": "not found", @@ -981,12 +988,14 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_rust/0.56.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_rust/0.61.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_rust/0.65.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_rust/0.67.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_rust/0.68.1-score/MODULE.bazel": "dc1c87d74ef6d32190e65c3c8aabfa7e7764e457bf9888312e0313c3c11fdb69", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_rust/0.68.1-score/source.json": "a9234d019b87b0deeebda96a67a8d56500bf28cadde3a47dc0eaf245f561ce02", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.2.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.3.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.4.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.5.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/refs/heads/main/modules/rules_shell/0.6.1/MODULE.bazel": "not found", diff --git a/module_integration_test/MODULE.bazel b/module_integration_test/MODULE.bazel index 068d73632..a01b84c63 100644 --- a/module_integration_test/MODULE.bazel +++ b/module_integration_test/MODULE.bazel @@ -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 diff --git a/score/message_passing/BUILD b/score/message_passing/BUILD index e73464aae..203c2a845 100644 --- a/score/message_passing/BUILD +++ b/score/message_passing/BUILD @@ -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", diff --git a/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp b/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp index 9f24814bb..c1f909ba3 100644 --- a/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp +++ b/score/mw/com/test/common_test_resources/sample_sender_receiver.cpp @@ -94,7 +94,7 @@ class MmanMock : public os::Mman { // mmap calls are uninteresting and are forwarded directly return reinterpret_cast( - os::StaticDestructionGuard::GetStorage()) + utils::StaticDestructionGuard::GetStorage()) .mmap(addr, length, protection, flags, fd, offset); }; @@ -102,7 +102,7 @@ class MmanMock : public os::Mman { // munmap calls are uninteresting and are forwarded directly return reinterpret_cast( - os::StaticDestructionGuard::GetStorage()) + utils::StaticDestructionGuard::GetStorage()) .munmap(addr, length); }; @@ -114,7 +114,7 @@ class MmanMock : public os::Mman std::strcpy(last_shm_open_path_, pathname); shm_open_callcount_++; return reinterpret_cast( - os::StaticDestructionGuard::GetStorage()) + utils::StaticDestructionGuard::GetStorage()) .shm_open(pathname, oflag, mode); }; @@ -122,7 +122,7 @@ class MmanMock : public os::Mman { // shm_unlink calls are uninteresting and are forwarded directly return reinterpret_cast( - os::StaticDestructionGuard::GetStorage()) + utils::StaticDestructionGuard::GetStorage()) .shm_unlink(pathname); }; @@ -133,7 +133,7 @@ class MmanMock : public os::Mman const os::Mman::PosixTypedMem tflag) const noexcept override { return reinterpret_cast( - os::StaticDestructionGuard::GetStorage()) + utils::StaticDestructionGuard::GetStorage()) .posix_typed_mem_open(name, oflag, tflag); } @@ -142,7 +142,7 @@ class MmanMock : public os::Mman struct posix_typed_mem_info* info) const noexcept override { return reinterpret_cast( - os::StaticDestructionGuard::GetStorage()) + utils::StaticDestructionGuard::GetStorage()) .posix_typed_mem_get_info(fd, info); }