unit-tests/osloader-test: make modules always built for the test

Author: stanislaw

.gitignore

@@ -1,3 +1,3 @@
 build/inc/
-posix-mac-addons
+posix-macos-addons
 

CMakeLists.txt

@@ -48,13 +48,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(OSAL C)
 
-# TODO-MAC:
-# This enforces the cwd() to be in the ${CMAKE_BINARY_DIR}. This needed for
-# deterministic calculation of full path to MODULE*.dylib libraries when running
-# from CLion.
-# https://stackoverflow.com/a/38166227/598057
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
 # OSAL_SYSTEM_OSTYPE and OSAL_SYSTEM_BSPTYPE indicate which of the OS packages
 # to build.  These are required and must be defined. Confirm that this exists
 # and error out now if it does not.
@@ -167,7 +160,6 @@ target_include_directories(osal_${OSAL_SYSTEM_OSTYPE}_impl PRIVATE
 # Define the external "osal" static library target
 # This is a combination of the generic parts with the low level
 # system-specific parts
-add_subdirectory(posix-mac-addons)
 
 add_library(osal STATIC
 	src/os/shared/osapi-binsem.c
@@ -199,7 +191,8 @@ target_include_directories(osal INTERFACE
     ${OSAL_API_INCLUDE_DIRECTORIES}
 )
 
-target_link_libraries(osal posix-mac-addons)
+add_subdirectory(posix-macos-addons)
+target_link_libraries(osal posix-macos-addons)
 
 # Link the OSAL with the BSP
 target_link_libraries(osal osal_bsp)

Makefile

@@ -6,7 +6,9 @@ test.unit: build.cmake
 	cd build.commandline.dir && ./unit-tests/oscore-test/osal_core_UT
 	cd build.commandline.dir && ./unit-tests/osfile-test/osal_file_UT
 	cd build.commandline.dir && ./unit-tests/osfilesys-test/osal_filesys_UT
-	cd build.commandline.dir && ./unit-tests/osloader-test/osal_loader_UT
+	# There are module files that the binary expects in the output folder.
+        # Therefore cd'ing to the test binary's dir.
+	cd build.commandline.dir/unit-tests/osloader-test && ./osal_loader_UT
 	cd build.commandline.dir && ./unit-tests/ostimer-test/osal_timer_UT
 	cd build.commandline.dir && ./unit-tests/osnetwork-test/osal_network_UT
 
@@ -26,6 +28,7 @@ test.integration: build.cmake
 build.cmake:
 	mkdir -p build.commandline.dir
 	cd build.commandline.dir && cmake -G Ninja \
+		-DCMAKE_C_FLAGS="-Werror" \
 		-DENABLE_UNIT_TESTS=1 \
 		-DOSAL_SYSTEM_OSTYPE=posix \
 		-DOSAL_SYSTEM_BSPTYPE=pc-linux \

src/os/posix/CMakeLists.txt

@@ -17,7 +17,7 @@ add_library(osal_posix_impl OBJECT
 	ostimer.c
 )
 
-target_link_libraries(osal_posix_impl posix-mac-addons)
+target_link_libraries(osal_posix_impl posix-macos-addons)
 
 # TODO-MAC: Defining this globally but can be made more focused.
 # 1) In file included from /sandbox/cFS/osal/src/os/posix/osloader.c:32:

src/os/posix/osapi.c

@@ -27,14 +27,13 @@
 #include "os-posix.h"
 #include "bsp-impl.h"
 
-#include <posix-mac-time.h>
-#include <posix-mac-semaphore2-debug.h>
-#include <posix-mac-stubs.h>
-#include <posix-mac-pthread.h>
-
-#include <assert.h>
 #include <sched.h>
 
+#include <posix-macos-time.h>
+#include <posix-macos-semaphore2-debug.h>
+#include <posix-macos-stubs.h>
+#include <posix-macos-pthread.h>
+
 /*
  * Defines
  */
@@ -95,7 +94,7 @@ typedef struct
 
 typedef struct
 {
-    mac_sem2_t id;
+    sem_t           id;
 }OS_impl_countsem_internal_record_t;
 
 /* Mutexes */
@@ -108,7 +107,7 @@ typedef struct
 typedef struct
 {
     bool            is_async;
-    mac_sem2_t      data_sem;
+    sem_t           data_sem;
     int             out_fd;
 }OS_impl_console_internal_record_t;
 
@@ -1821,7 +1820,7 @@ int32 OS_CountSemCreate_Impl (uint32 sem_id, uint32 sem_initial_value, uint32 op
         return OS_INVALID_SEM_VALUE;
     }
 
-    if (mac_sem2_debug_init(&OS_impl_count_sem_table[sem_id].id, 0, sem_initial_value) < 0)
+    if (sem_init(&OS_impl_count_sem_table[sem_id].id, 0, sem_initial_value) < 0)
     {
         return OS_SEM_FAILURE;
     }
@@ -1841,7 +1840,7 @@ int32 OS_CountSemCreate_Impl (uint32 sem_id, uint32 sem_initial_value, uint32 op
  *-----------------------------------------------------------------*/
 int32 OS_CountSemDelete_Impl (uint32 sem_id)
 {
-    if (mac_sem2_debug_destroy(&OS_impl_count_sem_table[sem_id].id) < 0)
+    if (sem_destroy(&OS_impl_count_sem_table[sem_id].id) < 0)
     {
         return OS_SEM_FAILURE;
     }
@@ -1861,7 +1860,7 @@ int32 OS_CountSemDelete_Impl (uint32 sem_id)
  *-----------------------------------------------------------------*/
 int32 OS_CountSemGive_Impl ( uint32 sem_id )
 {
-    if (mac_sem2_debug_post(&OS_impl_count_sem_table[sem_id].id) < 0)
+    if (sem_post(&OS_impl_count_sem_table[sem_id].id) < 0)
     {
         return OS_SEM_FAILURE;
     }
@@ -1881,7 +1880,7 @@ int32 OS_CountSemGive_Impl ( uint32 sem_id )
  *-----------------------------------------------------------------*/
 int32 OS_CountSemTake_Impl ( uint32 sem_id )
 {
-    if (mac_sem2_debug_wait(&OS_impl_count_sem_table[sem_id].id) < 0)
+    if (sem_wait(&OS_impl_count_sem_table[sem_id].id) < 0)
     {
         return OS_SEM_FAILURE;
     }
@@ -1908,7 +1907,7 @@ int32 OS_CountSemTimedWait_Impl ( uint32 sem_id, uint32 msecs )
     */
    OS_CompAbsDelayTime(msecs, &ts);
 
-   if (mac_sem2_debug_timedwait(&OS_impl_count_sem_table[sem_id].id, &ts) == 0)
+   if (sem_timedwait(&OS_impl_count_sem_table[sem_id].id, &ts) == 0)
    {
        result = OS_SUCCESS;
    }
@@ -1938,7 +1937,7 @@ int32 OS_CountSemGetInfo_Impl (uint32 sem_id, OS_count_sem_prop_t *count_prop)
 {
     int sval;
 
-    if (mac_sem2_debug_getvalue(&OS_impl_count_sem_table[sem_id].id, &sval) < 0)
+    if (sem_getvalue(&OS_impl_count_sem_table[sem_id].id, &sval) < 0)
     {
         return OS_SEM_FAILURE;
     }
@@ -2414,7 +2413,7 @@ void  OS_ConsoleWakeup_Impl(uint32 local_id)
     if (local->is_async)
     {
         /* post the sem for the utility task to run */
-        mac_sem2_debug_post(&local->data_sem);
+        sem_post(&local->data_sem);
     }
     else
     {
@@ -2441,7 +2440,7 @@ static void*  OS_ConsoleTask_Entry(void* arg)
     while (true)
     {
         OS_ConsoleOutput_Impl(local_arg.value);
-        mac_sem2_debug_wait(&local->data_sem);
+        sem_wait(&local->data_sem);
     }
     return NULL;
 } /* end OS_ConsoleTask_Entry */
@@ -2469,7 +2468,7 @@ int32 OS_ConsoleCreate_Impl(uint32 local_id)
 
         if (local->is_async)
         {
-            if (mac_sem2_debug_init(&OS_impl_console_table[local_id].data_sem, 0, 0) < 0)
+            if (sem_init(&OS_impl_console_table[local_id].data_sem, 0, 0) < 0)
             {
                 return_code = OS_SEM_FAILURE;
             }
@@ -2481,7 +2480,7 @@ int32 OS_ConsoleCreate_Impl(uint32 local_id)
 
                 if (return_code != OS_SUCCESS)
                 {
-                    mac_sem2_debug_destroy(&OS_impl_console_table[local_id].data_sem);
+                    sem_destroy(&OS_impl_console_table[local_id].data_sem);
                 }
             }
         }

src/os/posix/ostimer.c

@@ -25,8 +25,8 @@
 
 #include "os-posix.h"
 
-#include <posix-mac-stubs.h>
-#include <posix-mac-timer.h>
+#include <posix-macos-stubs.h>
+#include <posix-macos-timer.h>
 
 /****************************************************************************************
                                 EXTERNAL FUNCTION PROTOTYPES

src/unit-test-coverage/CMakeLists.txt

@@ -90,7 +90,7 @@ function (add_coverage_tests SETNAME)
         ${UT_COVERAGE_LINK_FLAGS}
         ${OSALCOVERAGE_STUB_LIB_LIST}
         ut_assert
-        posix-mac-addons
+        posix-macos-addons
       )
       add_test(${TESTNAME} ${TESTNAME}-testrunner)
 

src/unit-test-coverage/posix/modules/CMakeLists.txt

@@ -35,7 +35,7 @@ foreach(MODULE ${MODULE_LIST})
     target_compile_options(ut_${SETNAME}_${MODULE} PRIVATE
         ${UT_COVERAGE_COMPILE_FLAGS}
     )
-    target_link_libraries(ut_${SETNAME}_${MODULE} PUBLIC posix-mac-addons)
+    target_link_libraries(ut_${SETNAME}_${MODULE} PUBLIC posix-macos-addons)
   endif ()
 endforeach()
 

src/unit-tests/osloader-test/CMakeLists.txt

@@ -4,7 +4,9 @@ set(TEST_MODULE_FILES
   ut_osloader_module_test.c
   ut_osloader_symtable_test.c    
   ut_osloader_test.c)
-  
+
+add_osal_ut_exe(osal_loader_UT ${TEST_MODULE_FILES})
+
 # build many copies of the test module
 # we need to have unique modules to load up to OS_MAX_MODULES
 # This will cover up to 32 -- extras are ignored.  If needed this can be increased.
@@ -16,7 +18,5 @@ while(MOD GREATER 0)
     COMPILE_DEFINITIONS "MODULE_NAME=module${MOD}" 
     PREFIX ""
     LIBRARY_OUTPUT_DIRECTORY eeprom1)
+  add_dependencies(osal_loader_UT MODULE${MOD})
 endwhile(MOD GREATER 0)
-  
-add_osal_ut_exe(osal_loader_UT ${TEST_MODULE_FILES})
-