From 28177788d06abb8fa7924408564203f99f74d5b0 Mon Sep 17 00:00:00 2001 From: chinglee-iot <61685396+chinglee-iot@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:49:30 +0800 Subject: [PATCH] Fix vTaskSuspendAll assertion unit test (#1204) * Update kernel submodule to address vTaskDelete and vTaskSuspend change --- FreeRTOS/Test/CMock/smp/config_assert/config_assert_utest.c | 2 +- .../covg_multiple_priorities_no_timeslice_mock_utest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FreeRTOS/Test/CMock/smp/config_assert/config_assert_utest.c b/FreeRTOS/Test/CMock/smp/config_assert/config_assert_utest.c index b738b1554b..d5c4260bba 100644 --- a/FreeRTOS/Test/CMock/smp/config_assert/config_assert_utest.c +++ b/FreeRTOS/Test/CMock/smp/config_assert/config_assert_utest.c @@ -583,8 +583,8 @@ void test_prvGetExpectedIdleTime_assert_nextUnblock_lt_xTickCount( void ) /* vTaskSuspendAll */ vFakePortAssertIfISR_Expect(); - vFakePortGetCoreID_ExpectAndReturn( 0 ); ulFakePortSetInterruptMask_ExpectAndReturn( 0 ); + vFakePortGetCoreID_ExpectAndReturn( 0 ); vFakePortGetTaskLock_Expect(); vFakePortGetISRLock_Expect(); vFakePortReleaseISRLock_Expect(); diff --git a/FreeRTOS/Test/CMock/smp/multiple_priorities_no_timeslice_mock/covg_multiple_priorities_no_timeslice_mock_utest.c b/FreeRTOS/Test/CMock/smp/multiple_priorities_no_timeslice_mock/covg_multiple_priorities_no_timeslice_mock_utest.c index 53079d74a2..699ddd2e6b 100644 --- a/FreeRTOS/Test/CMock/smp/multiple_priorities_no_timeslice_mock/covg_multiple_priorities_no_timeslice_mock_utest.c +++ b/FreeRTOS/Test/CMock/smp/multiple_priorities_no_timeslice_mock/covg_multiple_priorities_no_timeslice_mock_utest.c @@ -800,8 +800,8 @@ void test_coverage_prvGetExpectedIdleTime_ready_list_eq_1( void ) /* vTaskSuspendAll */ vFakePortAssertIfISR_Expect(); - vFakePortGetCoreID_ExpectAndReturn( 0 ); ulFakePortSetInterruptMask_ExpectAndReturn( 0 ); + vFakePortGetCoreID_ExpectAndReturn( 0 ); vFakePortGetTaskLock_Expect(); /* prvCheckForRunStateChange */ vFakePortAssertIfISR_Expect(); @@ -906,8 +906,8 @@ void test_coverage_prvGetExpectedIdleTime_ready_list_eq_2( void ) /* vTaskSuspendAll */ vFakePortAssertIfISR_Stub( port_assert_if_isr_cb ); - vFakePortGetCoreID_ExpectAndReturn( 0 ); ulFakePortSetInterruptMask_ExpectAndReturn( 0 ); + vFakePortGetCoreID_ExpectAndReturn( 0 ); vFakePortGetTaskLock_Expect(); /* prvCheckForRunStateChange */ vFakePortGetCoreID_ExpectAndReturn( 0 );