4 files changed, 25 insertions(+), 21 deletions(-)

M module-db/CMakeLists.txt
M module-services/service-db/CMakeLists.txt
M module-services/service-desktop/tests/CMakeLists.txt
M module-utils/test/CMakeLists.txt

@@ 175,7 175,8 @@ target_link_libraries(${PROJECT_NAME} module-utils module-vfs )
 
 # Host target configuration(mainly used for unit testing)
 if (${ENABLE_TESTS})
-    add_subdirectory(tests)
+    message(WARNING "Unit tests for module-db are disabled until they're fixed (EGD-5583).")
+#    add_subdirectory(tests)
 endif ()
 
 third_party_source_optimization(${SQLITE3_SOURCE})

@@ 35,6 35,7 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 if (${ENABLE_TESTS})
-    add_subdirectory(test)
+    message(WARNING "Unit tests for service-db are disabled until they're fixed (EGD-5583).")
+#    add_subdirectory(test)
 endif ()
 

@@ 1,14 1,15 @@
 file (COPY "${CMAKE_CURRENT_LIST_DIR}/muditaos-unittest.tar" DESTINATION "${CMAKE_BINARY_DIR}/sys/updates")
 file (COPY "${CMAKE_CURRENT_LIST_DIR}/factory-test" DESTINATION "${CMAKE_BINARY_DIR}/sys")
 
-add_catch2_executable(
-    NAME
-        service-desktop
-    SRCS
-        unittest.cpp
-        tests-main.cpp
-    LIBS
-        service-desktop
-        module-utils
-        module-apps
-)
+message(WARNING "Unit tests for service-desktop are disbaled until they're fixed (EGD-5583).")
+# add_catch2_executable(
+#    NAME
+#        service-desktop
+#    SRCS
+#        unittest.cpp
+#        tests-main.cpp
+#    LIBS
+#        service-desktop
+#        module-utils
+#        module-apps
+#)

@@ 55,15 55,16 @@ add_catch2_executable(
         module-utils
 )
 
+message(WARNING "Unit tests for module-utils are disabled until they're fixed (EGD-5583).")
 # utils tests
-add_catch2_executable(
-    NAME
-        utils
-    SRCS
-        unittest_utils.cpp
-    LIBS
-        module-utils
-)
+# add_catch2_executable(
+#    NAME
+#        utils
+#    SRCS
+#        unittest_utils.cpp
+#    LIBS
+#        module-utils
+#)
 
 # Math tests
 add_catch2_executable(