yystopf/openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复部分内核态测试用例

Browse Source 
1.修复删除任务后调度不及时的问题
2.修复部分内核态测试用例

Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: I4cb29f6a7dce96bfdad68e0d89a004b5f5e33036
This commit is contained in:
zhushengle
2022-03-16 17:02:21 +08:00
parent 3f43438017
commit 0f38ecb863
89 changed files with 744 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
testsuites/kernel/sample/kernel_base/ipc/BUILD.gn
View File

@@ -26,42 +26,86 @@
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("//kernel/liteos_a/liteos.gni")
static_library("test_ipc") {
sources = [
"event/It_los_event.c",
"mux/It_los_mux.c",
"queue/It_los_queue.c",
"sem/It_los_sem.c",
kernel_module("test_ipc") {
sources = [ "mux/It_los_mux.c" ]
sources += [
"mux/full/It_los_mutex_006.c",
"mux/full/It_los_mutex_007.c",
"mux/full/It_los_mutex_008.c",
"mux/full/It_los_mutex_009.c",
"mux/full/It_los_mutex_010.c",
"mux/full/It_los_mutex_011.c",
"mux/full/It_los_mutex_012.c",
"mux/full/It_los_mutex_013.c",
"mux/full/It_los_mutex_015.c",
"mux/full/It_los_mutex_016.c",
"mux/full/It_los_mutex_017.c",
"mux/full/It_los_mutex_018.c",
"mux/full/It_los_mutex_020.c",
"mux/full/It_los_mutex_021.c",
"mux/full/It_los_mutex_025.c",
"mux/full/It_los_mutex_026.c",
"mux/full/It_los_mutex_027.c",
"mux/full/It_los_mutex_028.c",
"mux/full/It_los_mutex_029.c",
"mux/full/It_los_mutex_031.c",
"mux/full/It_los_mutex_035.c",
"mux/full/It_los_mutex_036.c",
"mux/full/It_los_mutex_037.c",
"mux/full/It_los_mutex_038.c",
"mux/full/It_los_mutex_039.c",
"mux/full/It_los_mutex_040.c",
"mux/full/It_los_mutex_041.c",
"mux/full/It_los_mutex_042.c",
"mux/full/It_los_mutex_043.c",
"mux/smoke/It_los_mutex_001.c",
"mux/smoke/It_los_mutex_002.c",
"mux/smoke/It_los_mutex_003.c",
"mux/smoke/It_los_mutex_004.c",
"mux/smp/It_smp_los_mux_001.c",
"mux/smp/It_smp_los_mux_002.c",
"mux/smp/It_smp_los_mux_003.c",
"mux/smp/It_smp_los_mux_004.c",
"mux/smp/It_smp_los_mux_005.c",
"mux/smp/It_smp_los_mux_006.c",
"mux/smp/It_smp_los_mux_007.c",
"mux/smp/It_smp_los_mux_2001.c",
"mux/smp/It_smp_los_mux_2002.c",
"mux/smp/It_smp_los_mux_2003.c",
"mux/smp/It_smp_los_mux_2004.c",
"mux/smp/It_smp_los_mux_2005.c",
"mux/smp/It_smp_los_mux_2006.c",
"mux/smp/It_smp_los_mux_2007.c",
"mux/smp/It_smp_los_mux_2008.c",
"mux/smp/It_smp_los_mux_2009.c",
"mux/smp/It_smp_los_mux_2010.c",
"mux/smp/It_smp_los_mux_2011.c",
"mux/smp/It_smp_los_mux_2012.c",
"mux/smp/It_smp_los_mux_2013.c",
"mux/smp/It_smp_los_mux_2014.c",
"mux/smp/It_smp_los_mux_2015.c",
"mux/smp/It_smp_los_mux_2016.c",
"mux/smp/It_smp_los_mux_2017.c",
"mux/smp/It_smp_los_mux_2018.c",
"mux/smp/It_smp_los_mux_2021.c",
"mux/smp/It_smp_los_mux_2022.c",
"mux/smp/It_smp_los_mux_2024.c",
"mux/smp/It_smp_los_mux_2025.c",
"mux/smp/It_smp_los_mux_2026.c",
"mux/smp/It_smp_los_mux_2027.c",
"mux/smp/It_smp_los_mux_2028.c",
"mux/smp/It_smp_los_mux_2029.c",
]
if (LOSCFG_TEST_SMOKE) {
sources += [
"event/smoke/It_los_event_031.c",
"event/smoke/It_los_event_035.c",
"event/smoke/It_los_event_036.c",
"event/smoke/It_los_event_041.c",
"mux/smoke/It_los_mutex_001.c",
"mux/smoke/It_los_mutex_002.c",
"mux/smoke/It_los_mutex_003.c",
"mux/smoke/It_los_mutex_004.c",
"queue/smoke/It_los_queue_001.c",
"queue/smoke/It_los_queue_097.c",
"queue/smoke/It_los_queue_100.c",
"queue/smoke/It_los_queue_105.c",
"queue/smoke/It_los_queue_head_002.c",
"sem/smoke/It_los_sem_001.c",
"sem/smoke/It_los_sem_003.c",
"sem/smoke/It_los_sem_006.c",
]
}
include_dirs = [
"../../../include/",
"sem",
"event",
"mux",
"queue",
]
cflags = [ "-Wno-error" ]
public_configs =
[ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ]
}

9
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_007.c
View File

@@ -85,7 +85,7 @@ static UINT32 Testcase(VOID)
g_testCount = 0;
task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task.usTaskPrio = (TASK_PRIO_TEST - 1);
task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1);
task.pcName = "VMuteB2_1";
task.uwStackSize = 0x900;
task.uwResved = 0;
@@ -98,7 +98,7 @@ static UINT32 Testcase(VOID)
TestExtraTaskDelay(2); // 2, delay for Timing control.
task2.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02;
task2.usTaskPrio = (TASK_PRIO_TEST - 2); // 2, set reasonable priority.
task2.usTaskPrio = (TASK_PRIO_TEST_TASK - 2); // 2, set reasonable priority.
task2.pcName = "VMuteB2_2";
task2.uwStackSize = 0x900;
task2.uwResved = 0;
@@ -115,8 +115,7 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID02);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
LOS_TaskDelete(g_testTaskID02);
return LOS_OK;
}
@@ -130,4 +129,4 @@ VOID ItLosMux007(void)
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#endif

5
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_009.c
View File

@@ -58,7 +58,7 @@ static UINT32 Testcase(VOID)
g_testCount = 0;
task.pfnTaskEntry = (TSK_ENTRY_FUNC)TestHook091;
task.usTaskPrio = (TASK_PRIO_TEST - 1);
task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1);
task.pcName = "VMutexB4";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.uwResved = 0;
@@ -70,8 +70,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxDestroy(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
LOS_TaskDelete(g_testTaskID01);
return LOS_OK;
}

8
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_011.c
View File

@@ -67,7 +67,7 @@ static UINT32 Testcase(VOID)
g_testCount = 0;
task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task.usTaskPrio = (TASK_PRIO_TEST - 1);
task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1);
task.pcName = "VMutexB6";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.uwResved = 0;
@@ -84,9 +84,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxDestroy(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
LOS_TaskDelete(g_testTaskID01);
return LOS_OK;
}
@@ -100,4 +98,4 @@ VOID ItLosMux011(void)
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#endif /* __cpluscplus */

7
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_012.c
View File

@@ -71,7 +71,7 @@ static UINT32 Testcase(VOID)
g_testCount = 0;
task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task.usTaskPrio = (TASK_PRIO_TEST - 1);
task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1);
task.pcName = "VMutexB7";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.uwResved = 0;
@@ -91,8 +91,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxDestroy(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
LOS_TaskDelete(g_testTaskID01);
return LOS_OK;
}
@@ -107,4 +106,4 @@ VOID ItLosMux012(void)
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#endif /* __cpluscplus */

12
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_015.c
View File

@@ -66,7 +66,7 @@ static VOID TaskF01(void)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task = { 0 };
TSK_INIT_PARAM_S task = {0};
ret = LosMuxCreate(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -74,7 +74,7 @@ static UINT32 Testcase(VOID)
g_testCount = 0;
task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task.usTaskPrio = (TASK_PRIO_TEST - 1);
task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1);
task.pcName = "VMuteB010";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.uwResved = 0;
@@ -86,15 +86,14 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxUnlock(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, EPERM, ret);
LOS_TaskDelay(10); // 10, delay for Timing control.
TestExtraTaskDelay(5); // 5, delay for Timing control.
LOS_TaskDelay(15); // 15, delay for Timing control.
ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount);
ret = LOS_MuxUnlock(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, EPERM, ret);
LOS_TaskDelay(10); // 10, delay for Timing control.
LOS_TaskDelay(20); // 20, delay for Timing control.
ret = LOS_MuxUnlock(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, EPERM, ret);
@@ -104,8 +103,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxDestroy(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
LOS_TaskDelete(g_testTaskID01);
return LOS_OK;
}

12
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c
View File

@@ -60,14 +60,14 @@ static VOID TaskF01(void)
VOID TaskF02(void)
{
UINT32 ret;
TSK_INIT_PARAM_S task1;
TSK_INIT_PARAM_S task1 = {0};
g_testCount++;
task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01;
task1.pcName = "LosMB2_2";
task1.uwStackSize = TASK_STACK_SIZE_TEST;
task1.usTaskPrio = TASK_PRIO_TEST - 3; // 3, set reasonable priority.
task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; // 3, set reasonable priority.
task1.uwResved = 0;
#ifdef LOSCFG_KERNEL_SMP
task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
@@ -97,7 +97,7 @@ static UINT32 Testcase(VOID)
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
task.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02;
task.usTaskPrio = (TASK_PRIO_TEST - 1);
task.usTaskPrio = (TASK_PRIO_TEST_TASK - 1);
task.pcName = "LosMB2_1";
task.uwStackSize = 0x900;
task.uwResved = 0;
@@ -116,8 +116,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelete(g_testTaskID02);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
LOS_TaskDelete(g_testTaskID01);
return LOS_OK;
}
@@ -131,4 +131,4 @@ VOID ItLosMux021(void)
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */
#endif /* __cpluscplus */

35
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c
View File

@@ -52,7 +52,8 @@ static VOID TaskDFunc(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 9, g_testCount); // 9, here assert the result.
g_testCount++;
@@ -73,7 +74,8 @@ static VOID TaskCFunc(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 11, g_testCount); // 11, here assert the result.
g_testCount++;
@@ -96,7 +98,8 @@ static VOID TaskBFunc(VOID)
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 13, g_testCount); // 13, here assert the result.
g_testCount++;
}
@@ -104,7 +107,9 @@ static VOID TaskBFunc(VOID)
static VOID TaskAFunc(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
TSK_INIT_PARAM_S task1 = { 0 };
TSK_INIT_PARAM_S task2 = { 0 };
TSK_INIT_PARAM_S task3 = { 0 };
g_testCount++;
@@ -160,22 +165,25 @@ static VOID TaskAFunc(VOID)
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result.
#if 1 // post mutex 3 -> mutex2 -> mutex1
ret = LOS_MuxUnlock(&g_mutexTest3);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 10, g_testCount); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result.
ret = LOS_MuxUnlock(&g_mutexTest2);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 12, g_testCount); // 12, here assert the result.
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result.
ret = LOS_MuxUnlock(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 14, g_testCount); // 14, here assert the result.
#endif
ret = LOS_MuxDestroy(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
@@ -187,20 +195,20 @@ static VOID TaskAFunc(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 14, g_testCount); // 14, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX,
LOS_HighBitGet(OsCurrTaskGet()->priBitMap));
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
}
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = { 0 };
g_testCount = 0;
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result.
ret = LosMuxCreate(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -216,8 +224,9 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskCreate(&g_testTaskID01, &task);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL(g_testCount, 14, g_testCount); // 14, here assert the result.
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result.
ICUNIT_ASSERT_EQUAL(g_testCount, 14, g_testCount); // 14, here assert the result.
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result.
return LOS_OK;
}

24
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c
View File

@@ -52,8 +52,8 @@ static VOID TaskD1Func(VOID)
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result.
g_testCount++;
}
@@ -72,7 +72,8 @@ static VOID TaskC1Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result.
g_testCount++;
}
@@ -91,14 +92,17 @@ static VOID TaskB1Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 7, g_testCount); // 7, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result.
g_testCount++;
}
static VOID TaskA1Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
TSK_INIT_PARAM_S task1 = {0};
TSK_INIT_PARAM_S task2 = {0};
TSK_INIT_PARAM_S task3 = {0};
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount);
@@ -147,9 +151,8 @@ static VOID TaskA1Func(VOID)
ret = LOS_MuxDestroy(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX,
LOS_HighBitGet(OsCurrTaskGet()->priBitMap));
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result.
}
@@ -157,7 +160,7 @@ static VOID TaskA1Func(VOID)
static UINT32 Testcase(void)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexTest1);
@@ -175,7 +178,8 @@ static UINT32 Testcase(void)
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL(g_testCount, 8, g_testCount); // 8, here assert the result.
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result.
return LOS_OK;
}

20
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c
View File

@@ -50,7 +50,8 @@ static VOID TaskD2Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
g_testCount++;
}
@@ -67,7 +68,8 @@ static VOID TaskC2Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
g_testCount++;
}
@@ -84,14 +86,17 @@ static VOID TaskB2Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 4, g_testCount); // 4, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
g_testCount++;
}
static VOID TaskA2Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
TSK_INIT_PARAM_S task1 = {0};
TSK_INIT_PARAM_S task2 = {0};
TSK_INIT_PARAM_S task3 = {0};
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount);
@@ -142,9 +147,8 @@ static VOID TaskA2Func(VOID)
ret = LOS_MuxDestroy(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX,
LOS_HighBitGet(OsCurrTaskGet()->priBitMap));
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result.
g_testCount++;
}
@@ -153,7 +157,7 @@ static VOID TaskA2Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexTest1);

24
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c
View File

@@ -53,14 +53,15 @@ static VOID TaskD3Func(VOID)
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result.
g_testCount++;
}
static VOID TaskC3Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1;
TSK_INIT_PARAM_S task1 = {0};
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 3, g_testCount); // 3, here assert the result.
@@ -94,7 +95,8 @@ static VOID TaskC3Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 7, g_testCount); // 7, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result.
g_testCount++;
}
@@ -111,14 +113,16 @@ static VOID TaskB3Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result.
g_testCount++;
}
static VOID TaskA3Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
TSK_INIT_PARAM_S task1 = {0};
TSK_INIT_PARAM_S task2 = {0};
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount);
@@ -158,16 +162,15 @@ static VOID TaskA3Func(VOID)
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 9, g_testCount); // 9, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX,
LOS_HighBitGet(OsCurrTaskGet()->priBitMap));
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
g_testCount++;
}
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexTest1);
@@ -185,7 +188,8 @@ static UINT32 Testcase(VOID)
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL(g_testCount, 10, g_testCount); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result.
return LOS_OK;
}

29
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c
View File

@@ -52,7 +52,8 @@ static VOID TaskD5Func(VOID)
ret = LOS_MuxUnlock(&g_mutexTest2);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 2, OsCurrTaskGet()->priority); // 2, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 2, priority); // 2, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result.
g_testCount++;
}
@@ -72,7 +73,8 @@ static VOID TaskC5Func(VOID)
ret = LOS_MuxUnlock(&g_mutexTest2);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 3, OsCurrTaskGet()->priority); // 3, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 3, priority); // 3, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result.
g_testCount++;
@@ -93,7 +95,8 @@ static VOID TaskB5Func(VOID)
ret = LOS_MuxUnlock(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 5, OsCurrTaskGet()->priority); // 5, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 5, priority); // 5, here assert the result.
g_testCount++;
}
@@ -150,17 +153,16 @@ static VOID TaskA5Func(VOID)
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result.
ret = LOS_MuxUnlock(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 5, g_testCount); // 5, here assert the result.
ret = LOS_MuxUnlock(&g_mutexTest2);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(LOS_HighBitGet(OsCurrTaskGet()->priBitMap), LOS_INVALID_BIT_INDEX,
LOS_HighBitGet(OsCurrTaskGet()->priBitMap));
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 7, g_testCount); // 5, here assert the result.
ret = LOS_MuxUnlock(&g_mutexTest1);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 8, g_testCount); // 8, here assert the result.
g_testCount++;
}
@@ -168,7 +170,7 @@ static VOID TaskA5Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexTest1);
@@ -196,7 +198,8 @@ static UINT32 Testcase(VOID)
ICUNIT_ASSERT_EQUAL(g_testCount, 9, g_testCount); // 9, here assert the result.
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, 25, OsCurrTaskGet()->priority); // 25, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, 25, priority); // 25, here assert the result.
return LOS_OK;
}

17
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c
View File

@@ -87,7 +87,7 @@ static VOID TaskService3Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
TSK_INIT_PARAM_S task1 = {0};
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount);
@@ -99,7 +99,7 @@ static VOID TaskMisc10Func(VOID)
task1.usTaskPrio = 3; // 3, set reasonable priority.
task1.pcName = "TaskService_3";
task1.uwStackSize = LOS_TASK_MIN_STACK_SIZE;
task1.uwResved = 0;
task1.uwResved = LOS_TASK_ATTR_JOINABLE;
#ifdef LOSCFG_KERNEL_SMP
task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
@@ -120,7 +120,7 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexTest1);
@@ -133,7 +133,7 @@ static UINT32 Testcase(VOID)
task.usTaskPrio = 10; // 10, set reasonable priority.
task.pcName = "TaskMisc_10";
task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
task.uwResved = 0;
task.uwResved = LOS_TASK_ATTR_JOINABLE;
#ifdef LOSCFG_KERNEL_SMP
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
@@ -145,7 +145,7 @@ static UINT32 Testcase(VOID)
task.usTaskPrio = 2; // 2, set reasonable priority.
task.pcName = "TaskFe_2";
task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
task.uwResved = 0;
task.uwResved = LOS_TASK_ATTR_JOINABLE;
#ifdef LOSCFG_KERNEL_SMP
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
@@ -163,6 +163,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxDestroy(&g_mutexTest2);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
OsShellCmdTskInfoGet(0xffffffff, NULL, 0);
// 10, here assert the result.
ICUNIT_GOTO_EQUAL(LOS_TaskPriGet(g_testTaskID01), 10, LOS_TaskPriGet(g_testTaskID01), EXIT);
// 3, here assert the result.
@@ -170,11 +171,11 @@ static UINT32 Testcase(VOID)
// 2, here assert the result.
ICUNIT_GOTO_EQUAL(LOS_TaskPriGet(g_testTaskID03), 2, LOS_TaskPriGet(g_testTaskID03), EXIT);
EXIT:
ret = LOS_TaskDelete(g_testTaskID01);
ret = LOS_TaskJoin(g_testTaskID01, NULL);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID02);
ret = LOS_TaskJoin(g_testTaskID02, NULL);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID03);
ret = LOS_TaskJoin(g_testTaskID03, NULL);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
return LOS_OK;

16
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c
View File

@@ -75,7 +75,7 @@ static VOID TaskService5Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
TSK_INIT_PARAM_S task1 = {0};
g_testCount++;
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 1, g_testCount);
@@ -86,7 +86,7 @@ static VOID TaskMisc10Func(VOID)
task1.usTaskPrio = 5; // 5, set reasonable priority.
task1.pcName = "TaskService_5";
task1.uwStackSize = LOS_TASK_MIN_STACK_SIZE;
task1.uwResved = 0;
task1.uwResved = LOS_TASK_ATTR_JOINABLE;
#ifdef LOSCFG_KERNEL_SMP
task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
@@ -107,7 +107,7 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexTest1);
@@ -117,7 +117,7 @@ static UINT32 Testcase(VOID)
task.usTaskPrio = 10; // 10, set reasonable priority.
task.pcName = "TaskMisc_10";
task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
task.uwResved = 0;
task.uwResved = LOS_TASK_ATTR_JOINABLE;
#ifdef LOSCFG_KERNEL_SMP
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
@@ -131,7 +131,7 @@ static UINT32 Testcase(VOID)
task.usTaskPrio = 4; // 4, set reasonable priority.
task.pcName = "TaskFe_4";
task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
task.uwResved = 0;
task.uwResved = LOS_TASK_ATTR_JOINABLE;
#ifdef LOSCFG_KERNEL_SMP
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
#endif
@@ -153,11 +153,11 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(LOS_TaskPriGet(g_testTaskID03), 4, LOS_TaskPriGet(g_testTaskID03), EXIT);
EXIT:
ret = LOS_TaskDelete(g_testTaskID01);
ret = LOS_TaskJoin(g_testTaskID01, NULL);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID02);
ret = LOS_TaskJoin(g_testTaskID02, NULL);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_TaskDelete(g_testTaskID03);
ret = LOS_TaskJoin(g_testTaskID03, NULL);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
return LOS_OK;
}

3
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c
View File

@@ -60,7 +60,6 @@ static VOID TaskFe4Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
g_testCount++;
for (INT32 i = 0; i < OS_MUX_NUM; i++) {
@@ -77,7 +76,7 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
g_testMux = LOS_MemAlloc(m_aucSysMem0, OS_MUX_NUM * sizeof(LosMux));

3
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c
View File

@@ -60,7 +60,6 @@ static VOID TaskFe4Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
g_testCount++;
for (INT32 i = 0; i < OS_MUX_NUM; i++) {
@@ -76,7 +75,7 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_testMux1);

6
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c
View File

@@ -66,7 +66,6 @@ static VOID TaskFe4Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
g_testCount++;
@@ -87,7 +86,7 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_testMux1);
@@ -158,7 +157,8 @@ EXIT:
ret = LOS_MuxUnlock(&g_testMux2);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, TASK_PRIO_TEST, OsCurrTaskGet()->priority);
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, TASK_PRIO_TEST_TASK, priority);
ret = LOS_MuxDestroy(&g_testMux1);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

16
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c
View File

@@ -63,7 +63,7 @@ static VOID TaskFe7Func(VOID)
ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 19, g_testCount); // 19, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 21, g_testCount); // 21, here assert the result.
g_testCount++;
return;
}
@@ -79,13 +79,13 @@ static VOID TaskFe8Func(VOID)
ret = LOS_MuxLock(&g_testMux3, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 20, g_testCount); // 20, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 18, g_testCount); // 18, here assert the result.
g_testCount++;
ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 21, g_testCount); // 21, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 22, g_testCount); // 22, here assert the result.
g_testCount++;
return;
}
@@ -100,7 +100,7 @@ static VOID TaskFe9Func(VOID)
ret = LOS_MuxLock(&g_testMux2, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 22, g_testCount); // 22, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 19, g_testCount); // 19, here assert the result.
g_testCount++;
ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER);
@@ -114,7 +114,6 @@ static VOID TaskFe9Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
g_testCount++;
@@ -174,7 +173,7 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task;
TSK_INIT_PARAM_S task = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_testMux1);
@@ -257,7 +256,7 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskDelete(g_testTaskID01);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(g_testCount, 18, g_testCount, EXIT); // 18, here assert the result.
ICUNIT_GOTO_EQUAL(g_testCount, 20, g_testCount, EXIT); // 20, here assert the result.
g_testCount++;
ret = LOS_MuxUnlock(&g_testMux1);
@@ -286,7 +285,8 @@ EXIT:
ret = LOS_MuxUnlock(&g_testMux4);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL(OsCurrTaskGet()->priority, TASK_PRIO_TEST, OsCurrTaskGet()->priority);
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_ASSERT_EQUAL(priority, TASK_PRIO_TEST_TASK, priority);
ret = LOS_MuxDestroy(&g_testMux1);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

17
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c
View File

@@ -45,11 +45,9 @@ static UINT32 g_mainTaskID;
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID);
g_testCount++;
ret = LOS_MuxLock(&g_testMux1, 10); // 10, init mutex.
ret = LOS_MuxLock(&g_testMux1, 100); // 100, init mutex.
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ETIMEDOUT, ret);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 3, g_testCount); // 3, here assert the result.
@@ -58,14 +56,13 @@ static VOID TaskMisc10Func(VOID)
return;
}
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S taskParam;
TSK_INIT_PARAM_S taskParam = {0};
g_testCount = 0;
LosTaskCB *task = NULL;
UINT16 prio = OsCurrTaskGet()->priority;
UINT16 prio = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
g_mainTaskID = OsCurrTaskGet()->taskID;
ret = LosMuxCreate(&g_testMux1);
@@ -88,11 +85,12 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskCreate(&g_testTaskID01, &taskParam);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result.
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, here assert the result.
g_testCount++;
LOS_TaskDelay(11); // 11, set delay time.
LOS_TaskDelay(110); // 110, set delay time.
ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT); // 4, here assert the result.
g_testCount++;
@@ -100,7 +98,8 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxUnlock(&g_testMux1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, prio, OsCurrTaskGet()->priority, EXIT);
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, prio, priority, EXIT);
EXIT:
LOS_MuxUnlock(&g_testMux1);

22
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c
View File

@@ -61,14 +61,13 @@ static VOID TaskFe4Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID);
g_testCount++;
ret = LOS_MuxLock(&g_testMux1, 10); // 10, init mutex.
ret = LOS_MuxLock(&g_testMux1, 100); // 100, init mutex.
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_ETIMEDOUT, ret);
ICUNIT_ASSERT_EQUAL_VOID(taskCB->priority, 4, taskCB->priority); // 4, here assert the result.
UINT16 priority = LOS_TaskPriGet(g_mainTaskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 4, priority); // 4, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result.
g_testCount++;
@@ -79,10 +78,10 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S taskParam;
TSK_INIT_PARAM_S taskParam = {0};
g_testCount = 0;
LosTaskCB *task = NULL;
UINT16 prio = OsCurrTaskGet()->priority;
UINT16 prio = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
g_mainTaskID = OsCurrTaskGet()->taskID;
ret = LosMuxCreate(&g_testMux1);
@@ -106,7 +105,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskCreate(&g_testTaskID01, &taskParam);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result.
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, here assert the result.
g_testCount++;
@@ -122,11 +122,12 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskCreate(&g_testTaskID03, &taskParam);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 4, OsCurrTaskGet()->priority, EXIT); // 4, here assert the result.
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, 4, priority, EXIT); // 4, here assert the result.
ICUNIT_GOTO_EQUAL(g_testCount, 5, g_testCount, EXIT); // 5, here assert the result.
g_testCount++;
LOS_TaskDelay(11); // 11, set delay time.
LOS_TaskDelay(200); // 200, set delay time.
ICUNIT_GOTO_EQUAL(g_testCount, 7, g_testCount, EXIT); // 7, here assert the result.
g_testCount++;
@@ -134,7 +135,8 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxUnlock(&g_testMux1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, prio, OsCurrTaskGet()->priority, EXIT);
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, prio, priority, EXIT);
ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);

19
testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c
View File

@@ -46,7 +46,6 @@ static UINT32 g_mainTaskID;
static VOID TaskFe4Func(VOID)
{
UINT32 ret;
LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID);
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 4, g_testCount); // 4, here assert the result.
g_testCount++;
@@ -54,7 +53,8 @@ static VOID TaskFe4Func(VOID)
ret = LOS_MuxLock(&g_testMux2, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret);
ICUNIT_ASSERT_EQUAL_VOID(taskCB->priority, 10, taskCB->priority); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(g_mainTaskID);
ICUNIT_ASSERT_EQUAL_VOID(priority, 10, priority); // 10, here assert the result.
ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 6, g_testCount); // 6, here assert the result.
g_testCount++;
@@ -67,8 +67,6 @@ static VOID TaskFe4Func(VOID)
static VOID TaskMisc10Func(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S task1, task2, task3;
LosTaskCB *taskCB = OS_TCB_FROM_TID(g_mainTaskID);
g_testCount++;
ret = LOS_MuxLock(&g_testMux1, LOS_WAIT_FOREVER);
@@ -86,12 +84,12 @@ static VOID TaskMisc10Func(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S taskParam;
TSK_INIT_PARAM_S taskParam = { 0 };
g_testCount = 0;
LosTaskCB *task = NULL;
LosMuxAttr attr = { 0 };
UINT16 prio = OsCurrTaskGet()->priority;
UINT16 prio = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
g_mainTaskID = OsCurrTaskGet()->taskID;
ret = LosMuxCreate(&g_testMux1);
@@ -127,7 +125,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskCreate(&g_testTaskID01, &taskParam);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result.
UINT16 priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result.
ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, here assert the result.
g_testCount++;
@@ -143,7 +142,8 @@ static UINT32 Testcase(VOID)
ret = LOS_TaskCreate(&g_testTaskID03, &taskParam);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, 10, OsCurrTaskGet()->priority, EXIT); // 10, here assert the result.
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, 10, priority, EXIT); // 10, here assert the result.
ICUNIT_GOTO_EQUAL(g_testCount, 5, g_testCount, EXIT); // 5, here assert the result.
g_testCount++;
@@ -156,7 +156,8 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxUnlock(&g_testMux1);
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ICUNIT_GOTO_EQUAL(OsCurrTaskGet()->priority, prio, OsCurrTaskGet()->priority, EXIT);
priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
ICUNIT_GOTO_EQUAL(priority, prio, priority, EXIT);
ICUNIT_GOTO_EQUAL(g_testCount, 9, g_testCount, EXIT); // 9, here assert the result.

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_001.c
View File

@@ -67,7 +67,7 @@ static UINT32 Testcase(VOID)
task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01;
task.pcName = "Test Case 1";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.usTaskPrio = TASK_PRIO_TEST;
task.usTaskPrio = TASK_PRIO_TEST_TASK;
task.uwResved = LOS_TASK_STATUS_DETACHED;
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_002.c
View File

@@ -64,7 +64,7 @@ static UINT32 Testcase(VOID)
task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01;
task.pcName = "Test Case 1";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.usTaskPrio = TASK_PRIO_TEST;
task.usTaskPrio = TASK_PRIO_TEST_TASK;
task.uwResved = LOS_TASK_STATUS_DETACHED;
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_003.c
View File

@@ -78,7 +78,7 @@ static UINT32 Testcase(VOID)
task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01;
task.pcName = "Test Case 1";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.usTaskPrio = TASK_PRIO_TEST;
task.usTaskPrio = TASK_PRIO_TEST_TASK;
task.uwResved = LOS_TASK_STATUS_DETACHED;
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_004.c
View File

@@ -61,7 +61,7 @@ static UINT32 Testcase(VOID)
task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01;
task.pcName = "Test Case 1";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.usTaskPrio = TASK_PRIO_TEST;
task.usTaskPrio = TASK_PRIO_TEST_TASK;
task.uwResved = LOS_TASK_STATUS_DETACHED;
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_005.c
View File

@@ -64,7 +64,7 @@ static UINT32 Testcase(VOID)
task.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01;
task.pcName = "Test Case 1";
task.uwStackSize = TASK_STACK_SIZE_TEST;
task.usTaskPrio = TASK_PRIO_TEST;
task.usTaskPrio = TASK_PRIO_TEST_TASK;
task.uwResved = LOS_TASK_STATUS_DETACHED;
task.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid);

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2001.c
View File

@@ -55,14 +55,14 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid()));
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2002.c
View File

@@ -55,7 +55,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -64,7 +64,7 @@ static UINT32 Testcase(VOID)
ret = LosMuxCreate(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2003.c
View File

@@ -55,7 +55,7 @@ static VOID HwiF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2004.c
View File

@@ -56,14 +56,14 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
ret = LosMuxCreate(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid()));
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2005.c
View File

@@ -82,7 +82,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -91,12 +91,12 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task1", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_005_task1", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2006.c
View File

@@ -67,7 +67,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
g_runFlag = 1;
@@ -77,7 +77,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_006_task1", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_006_task1", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2007.c
View File

@@ -72,7 +72,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -82,12 +82,12 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
// 2, set reasonable priority.
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task1", TaskF01, TASK_PRIO_TEST - 2,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task1", TaskF01, TASK_PRIO_TEST_TASK - 2,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_007_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2008.c
View File

@@ -56,7 +56,7 @@ static VOID HwiF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2009.c
View File

@@ -72,7 +72,7 @@ static VOID HwiF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -86,7 +86,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_009_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_009_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2010.c
View File

@@ -58,7 +58,7 @@ EXIT:
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -68,7 +68,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_010_task1", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_010_task1", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2011.c
View File

@@ -79,7 +79,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -88,7 +88,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -97,7 +97,7 @@ static UINT32 Testcase(VOID)
__asm__ volatile("nop");
} while (g_testCount != 1);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task1", TaskF01, TASK_PRIO_TEST + 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_011_task1", TaskF01, TASK_PRIO_TEST_TASK + 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2012.c
View File

@@ -96,7 +96,7 @@ EXIT:
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -110,7 +110,7 @@ static UINT32 Testcase(VOID)
HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task1", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task1", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
@@ -119,7 +119,7 @@ static UINT32 Testcase(VOID)
TestAssertBusyTaskDelay(100, 2); // 100, 2, delay for Timing control.
ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, here assert the result.
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task2", TaskF01, TASK_PRIO_TEST + 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2012_task2", TaskF01, TASK_PRIO_TEST_TASK + 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2013.c
View File

@@ -75,7 +75,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -87,14 +87,14 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task1", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task1", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_013_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2014.c
View File

@@ -81,7 +81,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -90,7 +90,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -99,7 +99,7 @@ static UINT32 Testcase(VOID)
__asm__ volatile("nop");
} while (g_testCount != 1);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task1", TaskF01, TASK_PRIO_TEST + 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task1", TaskF01, TASK_PRIO_TEST_TASK + 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2015.c
View File

@@ -97,7 +97,7 @@ static VOID HwiF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -115,7 +115,7 @@ static UINT32 Testcase(VOID)
HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
HalIrqSetAffinity(HWI_NUM_TEST1, CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -124,7 +124,7 @@ static UINT32 Testcase(VOID)
__asm__ volatile("nop");
} while (g_testCount != 2); // 2, wait until g_testCount == 2.
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task1", TaskF01, TASK_PRIO_TEST + 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2015_task1", TaskF01, TASK_PRIO_TEST_TASK + 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2016.c
View File

@@ -55,7 +55,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -65,7 +65,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid()));
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2017.c
View File

@@ -55,7 +55,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -67,7 +67,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_001_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -94,7 +94,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
EXIT:
LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST); // recovery test task's prio
LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST_TASK); // recovery test task's prio
LOS_TaskDelete(g_testTaskID01);
ret = LOS_MuxDestroy(&g_mutexkernelTest);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2018.c
View File

@@ -86,7 +86,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
g_flag1 = 1;
@@ -100,12 +100,12 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task1", TaskF01, TASK_PRIO_TEST + 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task1", TaskF01, TASK_PRIO_TEST_TASK + 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task2", TaskF02, TASK_PRIO_TEST + 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2018_task2", TaskF02, TASK_PRIO_TEST_TASK + 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu, low prio
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2021.c
View File

@@ -59,7 +59,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -71,7 +71,7 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_021_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_021_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2022.c
View File

@@ -50,7 +50,7 @@ static VOID HwiF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;

4
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2024.c
View File

@@ -62,7 +62,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -74,7 +74,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_event_014_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

2
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2025.c
View File

@@ -55,7 +55,7 @@ static VOID HwiF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2026.c
View File

@@ -77,7 +77,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid, i, uvIntSave;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
@@ -90,7 +90,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
// 3, set reasonable priority.
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task2", TaskF02, TASK_PRIO_TEST - 3,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task2", TaskF02, TASK_PRIO_TEST_TASK - 3,
CPUID_TO_AFFI_MASK(currCpuid)); // let the task f02 pend mux first
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -98,7 +98,7 @@ static UINT32 Testcase(VOID)
TestAssertBusyTaskDelay(100, 1); // 100, delay for Timing control.
ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task1", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_MUX_2026_task1", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid()));
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2027.c
View File

@@ -77,7 +77,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid, i;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
g_runFlag = 1;
@@ -90,12 +90,12 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task1", TaskF01, TASK_PRIO_TEST - 2, // 2, set reasonable priority.
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task1", TaskF01, TASK_PRIO_TEST_TASK - 2, // 2, set reasonable priority.
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_sem_034_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

6
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2028.c
View File

@@ -65,7 +65,7 @@ static VOID TaskF01(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid, i, j;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
for (i = 0; i < LOOP; i++) {
g_testCount = 0;
@@ -78,7 +78,7 @@ static UINT32 Testcase(VOID)
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_mux_028_task", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_mux_028_task", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -108,7 +108,7 @@ static UINT32 Testcase(VOID)
}
EXIT:
LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST); // recovery test task's prio
LOS_TaskPriSet(g_testTskHandle, TASK_PRIO_TEST_TASK); // recovery test task's prio
LOS_TaskDelete(g_testTaskID01);
LOS_MuxDestroy(&g_mutexkernelTest);
return LOS_OK;

8
testsuites/kernel/sample/kernel_base/ipc/mux/smp/It_smp_los_mux_2029.c
View File

@@ -76,7 +76,7 @@ static VOID TaskF02(VOID)
static UINT32 Testcase(VOID)
{
UINT32 ret, currCpuid, i, j;
TSK_INIT_PARAM_S testTask;
TSK_INIT_PARAM_S testTask = {0};
g_testCount = 0;
currCpuid = (ArchCurrCpuid() + 1) % (LOSCFG_KERNEL_CORE_NUM);
@@ -89,12 +89,12 @@ static UINT32 Testcase(VOID)
ret = LOS_MuxLock(&g_mutexkernelTest, LOS_WAIT_FOREVER);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task1", TaskF01, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task1", TaskF01, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(ArchCurrCpuid())); // current cpu
ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task2", TaskF02, TASK_PRIO_TEST - 1,
TEST_TASK_PARAM_INIT_AFFI(testTask, "it_smp_event_037_task2", TaskF02, TASK_PRIO_TEST_TASK - 1,
CPUID_TO_AFFI_MASK(currCpuid)); // other cpu
ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -123,8 +123,6 @@ static UINT32 Testcase(VOID)
PRINT_DEBUG("g_testCount = %d ,g_ret = 0x%x\n", g_testCount, g_ret);
ret = OS_TCB_FROM_TID(g_testTaskID02)->taskStatus;
ICUNIT_GOTO_NOT_EQUAL(ret & OS_TASK_STATUS_UNUSED, 0, ret, EXIT);
LOS_MuxDestroy(&g_mutexkernelTest);
}
EXIT: