Skip to content

Commit 545bd57

Browse files
parth21999Copilot
andcommitted
Move timed_test_suite.h include before ENABLE_MOCKS section
The include must be before ENABLE_MOCKS to prevent process_watchdog functions from being mocked, which causes unresolved external symbol linker errors. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 4647918 commit 545bd57

9 files changed

Lines changed: 18 additions & 9 deletions

File tree

tests/clds_hash_table_ut/clds_hash_table_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222

2323
#include "c_pal/interlocked.h"
2424

25+
#include "c_pal/timed_test_suite.h"
26+
2527
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2628
#include "c_pal/gballoc_hl.h"
2729
#include "c_pal/gballoc_hl_redirect.h"
2830
#include "c_pal/thandle.h"
29-
#include "c_pal/timed_test_suite.h"
3031

3132
#include "c_util/cancellation_token.h"
3233

tests/clds_hazard_pointers_thread_helper_ut/clds_hazard_pointers_thread_helper_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@
2121

2222
#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*/
2323

24+
#include "c_pal/timed_test_suite.h"
25+
2426
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2527
#include "c_pal/gballoc_hl.h"
2628
#include "c_pal/gballoc_hl_redirect.h"
2729

2830
#include "c_pal/thandle.h"
2931

3032
#include "c_pal/ps_util.h"
31-
#include "c_pal/timed_test_suite.h"
3233

3334
#include "c_util/thread_notifications_dispatcher.h"
3435
#include "clds/clds_hazard_pointers.h"

tests/clds_hazard_pointers_ut/clds_hazard_pointers_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020

2121
#include "clds/clds_hazard_pointers.h"
2222

23+
#include "c_pal/timed_test_suite.h"
24+
2325
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2426

2527
#include "c_pal/gballoc_hl.h"
2628
#include "c_pal/gballoc_hl_redirect.h"
27-
#include "c_pal/timed_test_suite.h"
2829

2930
#include "c_util/worker_thread.h"
3031

tests/clds_singly_linked_list_ut/clds_singly_linked_list_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
#include "umock_c/umock_c.h"
1717
#include "umock_c/umocktypes_stdint.h"
1818

19+
#include "c_pal/timed_test_suite.h"
20+
1921
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2022

2123
#include "c_pal/gballoc_hl.h"
2224
#include "c_pal/gballoc_hl_redirect.h"
23-
#include "c_pal/timed_test_suite.h"
2425
#include "clds/clds_st_hash_set.h"
2526
#include "clds/clds_hazard_pointers.h"
2627

tests/clds_sorted_list_ut/clds_sorted_list_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
#include "umock_c/umocktypes_stdint.h"
1919
#include "c_pal/interlocked.h"
2020

21+
#include "c_pal/timed_test_suite.h"
22+
2123
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2224

2325
#include "c_pal/gballoc_hl.h"
2426
#include "c_pal/gballoc_hl_redirect.h"
25-
#include "c_pal/timed_test_suite.h"
2627
#include "clds/clds_st_hash_set.h"
2728
#include "clds/clds_hazard_pointers.h"
2829

tests/clds_st_hash_set_ut/clds_st_hash_set_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
#include "umock_c/umock_c.h"
1717
#include "umock_c/umocktypes_stdint.h"
1818

19+
#include "c_pal/timed_test_suite.h"
20+
1921
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2022

2123
#include "c_pal/gballoc_hl.h"
2224
#include "c_pal/gballoc_hl_redirect.h"
23-
#include "c_pal/timed_test_suite.h"
2425

2526
#include "umock_c/umock_c_DISABLE_MOCKS.h" // ============================== DISABLE_MOCKS
2627

tests/lock_free_set_ut/lock_free_set_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
#include "umock_c/umocktypes_bool.h"
1919
#include "c_pal/interlocked.h"
2020

21+
#include "c_pal/timed_test_suite.h"
22+
2123
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2224

2325
#include "c_pal/gballoc_hl.h"
2426
#include "c_pal/gballoc_hl_redirect.h"
25-
#include "c_pal/timed_test_suite.h"
2627

2728
#include "umock_c/umock_c_DISABLE_MOCKS.h" // ============================== DISABLE_MOCKS
2829

tests/lru_cache_ut/lru_cache_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
// Task 25774695: Fix mocking for interlocked when using reals hazard pointers
2323
#include "c_pal/interlocked.h"
2424

25+
#include "c_pal/timed_test_suite.h"
26+
2527
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2628

2729
#include "c_pal/gballoc_hl.h"
2830
#include "c_pal/gballoc_hl_redirect.h"
2931
#include "c_pal/srw_lock_ll.h"
30-
#include "c_pal/timed_test_suite.h"
3132

3233
#include "c_util/doublylinkedlist.h"
3334

tests/mpsc_lock_free_queue_ut/mpsc_lock_free_queue_ut_pch.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
#include "umock_c/umock_c.h"
1818
#include "umock_c/umocktypes_bool.h"
1919

20+
#include "c_pal/timed_test_suite.h"
21+
2022
#include "umock_c/umock_c_ENABLE_MOCKS.h" // ============================== ENABLE_MOCKS
2123

2224
#include "c_pal/gballoc_hl.h"
2325
#include "c_pal/gballoc_hl_redirect.h"
24-
#include "c_pal/timed_test_suite.h"
2526

2627
#include "umock_c/umock_c_DISABLE_MOCKS.h" // ============================== DISABLE_MOCKS
2728

0 commit comments

Comments
 (0)