Require Os/Task implementation and add Fw/Time link dependencies

thomas-bc · Aug 2, 2024 · 7a27ec9 · 7a27ec9
1 parent 55ec7d4
commit 7a27ec9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Os/CMakeLists.txt b/Os/CMakeLists.txt
@@ -97,7 +97,7 @@ endif()
 register_fprime_module()
 
 require_fprime_implementation(Os/File)
-# require_fprime_implementation(Os/Task) # should be added in
+require_fprime_implementation(Os/Task)
 require_fprime_implementation(Os/Mutex) 
 
 
@@ -113,7 +113,7 @@ set(UT_SOURCE_FILES
 )
 register_fprime_ut()
 if (BUILD_TESTING)
-    foreach (TEST IN ITEMS StubFileTest PosixFileTest StubMutexTest PosixMutexTest) # add? : StubTaskTest PosixTaskTest
+    foreach (TEST IN ITEMS StubFileTest PosixFileTest StubMutexTest PosixMutexTest StubTaskTest PosixTaskTest)
        if (TARGET "${TEST}")
            add_dependencies("Os_ut_exe" "${TEST}")
        endif()

diff --git a/Os/Posix/CMakeLists.txt b/Os/Posix/CMakeLists.txt
@@ -50,7 +50,7 @@ set(HEADER_FILES
     "${CMAKE_CURRENT_LIST_DIR}/Task.hpp"
 )
 
-set(MOD_DEPS Os_Posix_Shared Fw/Time Os) # Os needs to be removed here?
+set(MOD_DEPS Os_Posix_Shared Fw/Time)
 register_fprime_module(Os_Task_Posix)
 register_fprime_implementation(Os/Task Os_Task_Posix "${CMAKE_CURRENT_LIST_DIR}/DefaultTask.cpp")
 
@@ -74,7 +74,7 @@ set(SOURCE_FILES
 set(HEADER_FILES
     "${CMAKE_CURRENT_LIST_DIR}/Mutex.hpp"
 )
-set(MOD_DEPS Os_Posix_Shared)
+set(MOD_DEPS Os_Posix_Shared Fw/Time)
 register_fprime_module(Os_Mutex_Posix)
 register_fprime_implementation(Os/Mutex Os_Mutex_Posix "${CMAKE_CURRENT_LIST_DIR}/DefaultMutex.cpp")
 

diff --git a/Os/Posix/DefaultTask.cpp b/Os/Posix/DefaultTask.cpp
@@ -3,7 +3,7 @@
 // \brief sets default Os::Task to posix implementation via linker
 // ======================================================================
 #include <cerrno>
-#include "Os/Task.hpp"
+#include <Fw/Time/Time.hpp>
 #include "Os/Posix/Task.hpp"
 #include "Os/Delegate.hpp"
 

diff --git a/Os/Stub/CMakeLists.txt b/Os/Stub/CMakeLists.txt
@@ -85,6 +85,7 @@ set(UT_MOD_DEPS
         Os
         Os_Models
         STest
+        Fw/Time
 )
 choose_fprime_implementation(Os/Mutex Os_Mutex_Test_Stub)
 register_fprime_ut(StubMutexTest)
diff --git a/Os/Stub/test/DefaultTask.cpp b/Os/Stub/test/DefaultTask.cpp
@@ -3,7 +3,7 @@
 // \brief sets default Os::Task to test stub implementation via linker
 // ======================================================================
 #include <cerrno>
-#include "Os/Task.hpp"
+#include <Fw/Time/Time.hpp>
 #include "Os/Stub/test/Task.hpp"
 #include "Os/Delegate.hpp"
 #include <sys/time.h>