Fixes #718 (#876)

Signed-off-by: Toby Cormack <tcormack@mathworks.com>
CppMicroServices · Jul 5, 2023 · baa8a7d · baa8a7d · github-actions · Jul 5, 2023
1 parent 2d9650a
commit baa8a7d
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/framework/test/gtest/BundleContextTest.cpp b/framework/test/gtest/BundleContextTest.cpp
@@ -179,8 +179,17 @@ TEST(BundleContextTest, NoSegfaultWithServiceFactory)
             framework.WaitForStop(std::chrono::milliseconds::zero());
         });
 
-    ASSERT_EQ(nullptr, context.GetService(svcGetServiceThrowsRefs[0]));
-
+    // Have to wrap call in a try catch. Without one, if the program throws the main thread will exit without calling
+    // .join() and when the spawned thread is destructed, it will call terminate because it was not joined.
+    try
+    {
+        // Framework may throw as the registration is no longer valid (depending on thread ordering) but we care that no
+        // thread segfaults
+        context.GetService(svcGetServiceThrowsRefs[0]);
+    }
+    catch (...)
+    {
+    }
     thread.join();
 }
 #endif