Merge pull request #1684 from ApexAI/iox-1683-disable-robust-mutex-te…

…st-for-qnx iox-#1683 Disable robust mutex test for qnx
eclipse-iceoryx · Sep 29, 2022 · 908b7e9 · 908b7e9
2 parents 860dd9f + 175b560
commit 908b7e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/iceoryx_hoofs/test/moduletests/test_posix_mutex.cpp b/iceoryx_hoofs/test/moduletests/test_posix_mutex.cpp
@@ -223,6 +223,9 @@ TEST_F(Mutex_test,
        MutexWithOnReleaseWhenLockedBehaviorUnlocksLockedMutexWhenThreadTerminatesAndSetsItIntoInconsistentState)
 {
     ::testing::Test::RecordProperty("TEST_ID", "4da7b1fb-23f1-421c-acf3-2a3d9e26b1a1");
+#if defined(QNX) || defined(__QNX) || defined(__QNX__) || defined(QNX__)
+    GTEST_SKIP() << "iox-#1683 QNX supports robust mutex not like the posix standard describes them.";
+#endif
     iox::cxx::optional<iox::posix::mutex> sut;
     ASSERT_FALSE(iox::posix::MutexBuilder()
                      .threadTerminationBehavior(iox::posix::MutexThreadTerminationBehavior::RELEASE_WHEN_LOCKED)
@@ -244,6 +247,9 @@ TEST_F(Mutex_test,
 TEST_F(Mutex_test, MutexWithStallWhenLockedBehaviorDoesntUnlockMutexWhenThreadTerminates)
 {
     ::testing::Test::RecordProperty("TEST_ID", "9beae890-f18e-4878-a957-312920eb1833");
+#if defined(QNX) || defined(__QNX) || defined(__QNX__) || defined(QNX__)
+    GTEST_SKIP() << "iox-#1683 QNX supports robust mutex not like the posix standard describes them.";
+#endif
     iox::cxx::optional<iox::posix::mutex> sut;
     ASSERT_FALSE(iox::posix::MutexBuilder()
                      .threadTerminationBehavior(iox::posix::MutexThreadTerminationBehavior::STALL_WHEN_LOCKED)

diff --git a/iceoryx_posh/include/iceoryx_posh/popo/trigger_handle.hpp b/iceoryx_posh/include/iceoryx_posh/popo/trigger_handle.hpp
@@ -37,7 +37,8 @@ namespace popo
 class TriggerHandle
 {
   public:
-    TriggerHandle() noexcept = default;
+    /// @warning do not use =default here otherwise QNX will fail to compile!
+    TriggerHandle() noexcept;
 
     /// @brief Creates a TriggerHandle
     /// @param[in] conditionVariableDataRef reference to a condition variable data struct

diff --git a/iceoryx_posh/source/popo/trigger_handle.cpp b/iceoryx_posh/source/popo/trigger_handle.cpp
@@ -21,6 +21,10 @@ namespace iox
 {
 namespace popo
 {
+TriggerHandle::TriggerHandle() noexcept
+{
+}
+
 TriggerHandle::TriggerHandle(ConditionVariableData& conditionVariableData,
                              const cxx::function<void(uint64_t)>& resetCallback,
                              const uint64_t uniqueTriggerId) noexcept