Merge branch 'kp/job-manager' into kp/ban-exceptions

Signed-off-by: Luca Della Vedova <[email protected]>
osrf · Dec 3, 2024 · c697952 · c697952
2 parents b85cc40 + de2ae38
commit c697952
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/nexus_workcell_orchestrator/CMakeLists.txt b/nexus_workcell_orchestrator/CMakeLists.txt
@@ -94,21 +94,26 @@ if(BUILD_TESTING)
   # Adds a ament catch2 test with some common libraries.
   # Usage: nexus_add_test(<target> <source>...)
   function(nexus_add_test target)
-    ament_add_catch2(${target} src/main_test.cpp ${ARGN})
+    ament_add_catch2(${target} ${ARGN})
     target_link_libraries(${target} PRIVATE
       ${PROJECT_NAME}_plugin
       nexus_common::nexus_common_test
     )
   endfunction()
 
   nexus_add_test(serialization_tests
+    src/main_test.cpp
     src/serialization_test.cpp
   )
   nexus_add_test(task_results_tests
+    src/main_test.cpp
     src/task_results_test.cpp
   )
   nexus_add_test(transform_pose_test src/transform_pose_test.cpp)
-  nexus_add_test(job_manager_test src/job_manager_test.cpp)
+  nexus_add_test(job_manager_test
+    src/main_test.cpp
+    src/job_manager_test.cpp
+  )
 endif()
 
 ament_package()
diff --git a/nexus_workcell_orchestrator/src/job_manager_test.cpp b/nexus_workcell_orchestrator/src/job_manager_test.cpp
@@ -19,7 +19,7 @@
 
 #include <nexus_common_test/test_utils.hpp>
 
-#include <catch2/catch.hpp>
+#include <rmf_utils/catch.hpp>
 
 namespace nexus::workcell_orchestrator::test {