Azure · parth21999 · Mar 2, 2026 · Mar 4, 2026
diff --git a/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut.c b/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut.c
@@ -45,7 +45,7 @@ static HRESULT MU_C2(real_, CREATE_IFABRICINSTANCE_NAME(IFabricZZZZ))(IFabricZZZ
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -67,7 +67,7 @@ TEST_SUITE_INITIALIZE(suite_init)
 
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut_pch.h b/sfwrapper/tests/h_fabric_macro_generator_ut/h_fabric_macro_generator_ut_pch.h
@@ -27,6 +27,8 @@
 
 /*for the purpose of these tests, there's going to be a phony IFabricZZZ interface*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
@@ -41,4 +43,4 @@
 
 #include "hfabriczzzz.h"
 
-#endif // H_FABRIC_MACRO_GENERATOR_UT_PCH_H
+#endif // H_FABRIC_MACRO_GENERATOR_UT_PCH_H
diff --git a/tests/common_argc_argv_int/CMakeLists.txt b/tests/common_argc_argv_int/CMakeLists.txt
@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
diff --git a/tests/common_argc_argv_int/common_argc_argv_int.c b/tests/common_argc_argv_int/common_argc_argv_int.c
@@ -13,16 +13,17 @@
 #include "c_pal/gballoc_hl_redirect.h"
 
 #include "c_pal/string_utils.h"
+#include "c_pal/timed_test_suite.h"
 
 #include "sf_c_util/common_argc_argv.h"
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
 }
 
@@ -310,4 +311,4 @@ TEST_FUNCTION(ARGC_ARGV_concat_from_2_plus_2_yields_4)
 }
 
 
-END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
+END_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
diff --git a/tests/configuration_package_change_handler_ut/CMakeLists.txt b/tests/configuration_package_change_handler_ut/CMakeLists.txt
@@ -21,5 +21,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS sf_c_util c_util com_wrapper debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal sf_c_util c_util com_wrapper debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/configuration_package_change_handler_ut_pch.h")
diff --git a/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut.c b/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut.c
@@ -71,7 +71,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -82,7 +82,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut_pch.h b/tests/configuration_package_change_handler_ut/configuration_package_change_handler_ut_pch.h
@@ -22,6 +22,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -37,4 +39,4 @@
 #include "sf_c_util/fabric_configuration_package_change_handler_com.h"
 #include "sf_c_util/configuration_package_change_handler.h"
 
-#endif // CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
+#endif // CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
diff --git a/tests/configuration_reader_ut/CMakeLists.txt b/tests/configuration_reader_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName configuration_reader_ut)
@@ -19,5 +19,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/configuration_reader_ut_pch.h")
diff --git a/tests/configuration_reader_ut/configuration_reader_ut.c b/tests/configuration_reader_ut/configuration_reader_ut.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "configuration_reader_ut_pch.h"
@@ -114,7 +114,7 @@ static void setup_expectation_read_double_values(void)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -139,7 +139,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_TYPE(LPCWSTR, const_wcharptr);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/tests/configuration_reader_ut/configuration_reader_ut_pch.h b/tests/configuration_reader_ut/configuration_reader_ut_pch.h
@@ -31,6 +31,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
@@ -55,4 +57,4 @@
 
 #include "sf_c_util/configuration_reader.h"
 
-#endif // CONFIGURATION_READER_UT_PCH_H
+#endif // CONFIGURATION_READER_UT_PCH_H
diff --git a/tests/fabric_async_op_cb_ut/CMakeLists.txt b/tests/fabric_async_op_cb_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_async_op_cb_ut)
@@ -17,5 +17,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_async_op_cb_ut_pch.h")
diff --git a/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut.c b/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "fabric_async_op_cb_ut_pch.h"
@@ -19,7 +19,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -28,7 +28,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut_pch.h b/tests/fabric_async_op_cb_ut/fabric_async_op_cb_ut_pch.h
@@ -17,6 +17,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -28,4 +30,4 @@
 
 #include "sf_c_util/fabric_async_op_cb.h"
 
-#endif // FABRIC_ASYNC_OP_CB_UT_PCH_H
+#endif // FABRIC_ASYNC_OP_CB_UT_PCH_H
diff --git a/tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt b/tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_async_op_sync_wrapper_ut)
@@ -32,4 +32,4 @@ testasyncoperation.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper synchronization c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID com_wrapper synchronization c_pal_reals sf_c_util)
diff --git a/tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c b/tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c
@@ -90,7 +90,7 @@ static HRESULT my_TEST_FABRIC_ASYNC_OPERATION_HANDLE_ITestAsyncOperation_test_fa
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -113,7 +113,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_UMOCK_ALIAS_TYPE(TEST_ASYNC_OPERATION_CONTEXT_HANDLE_DESTROY_FUNC, void*);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/tests/fabric_async_op_wrapper_ut/CMakeLists.txt b/tests/fabric_async_op_wrapper_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_async_op_wrapper_ut)
@@ -32,4 +32,4 @@ testasyncoperation.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals sf_c_util)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals sf_c_util)
diff --git a/tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c b/tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c
@@ -109,7 +109,7 @@ static void setup_success_async_execute_completed_synchronously(USER_INVOKE_CB*
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -133,7 +133,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_UMOCK_ALIAS_TYPE(TEST_ASYNC_OPERATION_CONTEXT_HANDLE_DESTROY_FUNC, void*);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/tests/fabric_configuration_package_change_handler_ut/CMakeLists.txt b/tests/fabric_configuration_package_change_handler_ut/CMakeLists.txt
@@ -17,5 +17,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_configuration_package_change_handler_ut_pch.h")
diff --git a/..._configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut.c b/..._configuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut.c
@@ -32,7 +32,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -41,7 +41,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GBALLOC_HL_GLOBAL_MOCK_HOOK();
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/...figuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut_pch.h b/...figuration_package_change_handler_ut/fabric_configuration_package_change_handler_ut_pch.h
@@ -17,6 +17,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -28,4 +30,4 @@
 
 #include "sf_c_util/fabric_configuration_package_change_handler.h"
 
-#endif // FABRIC_CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
+#endif // FABRIC_CONFIGURATION_PACKAGE_CHANGE_HANDLER_UT_PCH_H
diff --git a/tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt b/tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_op_completed_sync_ctx_ut)
@@ -20,5 +20,5 @@ test_callback_com.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_op_completed_sync_ctx_ut_pch.h")
diff --git a/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c b/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c
@@ -19,7 +19,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -36,7 +36,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_UMOCK_ALIAS_TYPE(TEST_CALLBACK_HANDLE_DESTROY_FUNC, void*);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
 

diff --git a/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut_pch.h b/tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut_pch.h
@@ -23,6 +23,8 @@
 
 #include "c_pal/interlocked.h" /*included for mocking reasons - it will prohibit creation of mocks belonging to interlocked.h - at the moment verified through int tests - this is porting legacy code, temporary solution*/
 
+#include "c_pal/timed_test_suite.h"
+
 #include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
 
 #include "c_pal/gballoc_hl.h"
@@ -40,4 +42,4 @@
 
 #include "sf_c_util/fabric_op_completed_sync_ctx.h"
 
-#endif // FABRIC_OP_COMPLETED_SYNC_CTX_UT_PCH_H
+#endif // FABRIC_OP_COMPLETED_SYNC_CTX_UT_PCH_H
diff --git a/tests/fabric_string_result_ut/CMakeLists.txt b/tests/fabric_string_result_ut/CMakeLists.txt
@@ -1,4 +1,4 @@
-#Copyright (c) Microsoft. All rights reserved.
+#Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 set(theseTestsName fabric_string_result_ut)
@@ -17,5 +17,5 @@ set(${theseTestsName}_h_files
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals
     ENABLE_TEST_FILES_PRECOMPILED_HEADERS "${CMAKE_CURRENT_LIST_DIR}/fabric_string_result_ut_pch.h")
diff --git a/tests/fabric_string_result_ut/fabric_string_result_ut.c b/tests/fabric_string_result_ut/fabric_string_result_ut.c
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "fabric_string_result_ut_pch.h"
@@ -13,7 +13,7 @@ static void on_umock_c_error(UMOCK_C_ERROR_CODE error_code)
 
 BEGIN_TEST_SUITE(TEST_SUITE_NAME_FROM_CMAKE)
 
-TEST_SUITE_INITIALIZE(suite_init)
+TIMED_TEST_SUITE_INITIALIZE(suite_init, TIMED_TEST_DEFAULT_TIMEOUT_MS)
 {
     ASSERT_ARE_EQUAL(int, 0, real_gballoc_hl_init(NULL, NULL));
 
@@ -23,7 +23,7 @@ TEST_SUITE_INITIALIZE(suite_init)
     REGISTER_GLOBAL_MOCK_FAIL_RETURN(malloc, NULL);
 }
 
-TEST_SUITE_CLEANUP(suite_cleanup)
+TIMED_TEST_SUITE_CLEANUP(suite_cleanup)
 {
     umock_c_deinit();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ set(${theseTestsName}_h_files

		include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)

		build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)
		build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_pal c_util debug FabricUUIDD optimized FabricUUID c_pal_reals sf_c_util)