From b25148107b034849b46bf1d20a53f1d9443d1af2 Mon Sep 17 00:00:00 2001 From: xuxinyu Date: Wed, 16 Nov 2022 15:55:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuxinyu Change-Id: Ide6f04adcd3bb12ae296f981cab84f9d7ce867fc --- testsuites/sample/cmsis/cmsis_func_test.c | 20 +++++++++---------- .../kernel/queue/It_los_queue_static_004.c | 8 +++++--- .../posix/src/mqueue/mqueue_func_test.c | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/testsuites/sample/cmsis/cmsis_func_test.c b/testsuites/sample/cmsis/cmsis_func_test.c index 4423987c..0bcfc9f9 100644 --- a/testsuites/sample/cmsis/cmsis_func_test.c +++ b/testsuites/sample/cmsis/cmsis_func_test.c @@ -117,14 +117,14 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1) msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr); ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId); - name = osMessageQueueGetName(msgQueueId); + name = (CHAR *)osMessageQueueGetName(msgQueueId); ret = strcmp(name, "q1"); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = osMessageQueueDelete(msgQueueId); ICUNIT_ASSERT_EQUAL(ret, osOK, ret); - name = osMessageQueueGetName(msgQueueId); + name = (CHAR *)osMessageQueueGetName(msgQueueId); ICUNIT_ASSERT_EQUAL(name, NULL, name); #endif @@ -155,13 +155,13 @@ static VOID CmsisQueueTestThread1(VOID) osStatus_t status; ret = osMessageQueuePut(g_msgQueueId1, &g_strbuff1, 0U, 0U); - ICUNIT_ASSERT_EQUAL(ret, osOK, ret); + ICUNIT_ASSERT_EQUAL_VOID(ret, osOK, ret); status = osMessageQueueGet(g_msgQueueId2, &data, NULL, QUEUE_WAIT_TIMEOUT); - ICUNIT_ASSERT_EQUAL(status, osOK, status); + ICUNIT_ASSERT_EQUAL_VOID(status, osOK, status); ret = strcmp(data, "world"); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); + ICUNIT_ASSERT_EQUAL_VOID(ret, 0, ret); } static VOID CmsisQueueTestThread2(VOID) @@ -171,13 +171,13 @@ static VOID CmsisQueueTestThread2(VOID) osStatus_t status; status = osMessageQueueGet(g_msgQueueId1, &data, NULL, QUEUE_WAIT_TIMEOUT); - ICUNIT_ASSERT_EQUAL(status, osOK, status); + ICUNIT_ASSERT_EQUAL_VOID(status, osOK, status); ret = strcmp(data, "hello"); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); + ICUNIT_ASSERT_EQUAL_VOID(ret, 0, ret); ret = osMessageQueuePut(g_msgQueueId2, &g_strbuff2, 0U, 0U); - ICUNIT_ASSERT_EQUAL(ret, osOK, ret); + ICUNIT_ASSERT_EQUAL_VOID(ret, osOK, ret); } static INT32 ThreadReadWriteTest(VOID) @@ -193,10 +193,10 @@ static INT32 ThreadReadWriteTest(VOID) g_msgQueueId2 = osMessageQueueNew(1, strlen(g_strbuff2), &attr); ICUNIT_ASSERT_NOT_EQUAL(g_msgQueueId2, NULL, g_msgQueueId2); - threadId1 = osThreadNew(CmsisQueueTestThread1, NULL, NULL); + threadId1 = osThreadNew((osThreadFunc_t)CmsisQueueTestThread1, NULL, NULL); ICUNIT_ASSERT_NOT_EQUAL(threadId1, NULL, threadId1); - threadId2 = osThreadNew(CmsisQueueTestThread2, NULL, NULL); + threadId2 = osThreadNew((osThreadFunc_t)CmsisQueueTestThread2, NULL, NULL); ICUNIT_ASSERT_NOT_EQUAL(threadId2, NULL, threadId2); osThreadJoin(threadId1); diff --git a/testsuites/sample/kernel/queue/It_los_queue_static_004.c b/testsuites/sample/kernel/queue/It_los_queue_static_004.c index 37f553c3..99cb54af 100644 --- a/testsuites/sample/kernel/queue/It_los_queue_static_004.c +++ b/testsuites/sample/kernel/queue/It_los_queue_static_004.c @@ -35,17 +35,19 @@ static UINT32 Testcase(VOID) { UINT32 ret; + UINT32 msgSize = (UINT32)QUEUE_BASE_MSGSIZE; + CHAR buff1[QUEUE_SHORT_BUFFER_LENGTH] = "UniDSP"; CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = {0}; CHAR buff3[QUEUE_SHORT_BUFFER_LENGTH] = {0}; - ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, buff3, 0, QUEUE_BASE_MSGSIZE); + ret = LOS_QueueCreateStatic("Q1", QUEUE_BASE_NUM, &g_testQueueID01, (UINT8 *)buff3, 0, QUEUE_BASE_MSGSIZE); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = LOS_QueueWriteCopy(g_testQueueID01, &buff1, QUEUE_BASE_MSGSIZE, 0); + ret = LOS_QueueWriteCopy(g_testQueueID01, &buff1, (UINT32)QUEUE_BASE_MSGSIZE, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = LOS_QueueReadCopy(g_testQueueID01, &buff2, QUEUE_BASE_MSGSIZE, 0); + ret = LOS_QueueReadCopy(g_testQueueID01, &buff2, &msgSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ret = strcmp((CHAR *)buff2, (CHAR *)buff3); diff --git a/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c b/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c index dbe3224f..9d78ea92 100644 --- a/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c +++ b/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c @@ -56,7 +56,7 @@ const int MAX_MQ_NAME_LEN = 256; // max mqueue name length const int MAX_MQ_MSG_SIZE = 65530; // max mqueue message size // return n: 0 < n <= max -unsigned int GetRandom(unsigned int max) +static unsigned int GetRandom(unsigned int max) { if (max == 0 || max == 1) { return 1;