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

!916 修复用例告警 

Merge pull request !916 from xuxinyu/1116
This commit is contained in:
openharmony_ci 2022-11-18 09:14:03 +00:00 committed by Gitee
parent 0818b28aa7 b25148107b
commit a650df0575
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
testsuites/sample/cmsis/cmsis_func_test.c
View File

@ -117,14 +117,14 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1)
msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr); msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr);
ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId); ICUNIT_ASSERT_NOT_EQUAL(msgQueueId, NULL, msgQueueId);
name = osMessageQueueGetName(msgQueueId); name = (CHAR *)osMessageQueueGetName(msgQueueId);
ret = strcmp(name, "q1"); ret = strcmp(name, "q1");
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = osMessageQueueDelete(msgQueueId); ret = osMessageQueueDelete(msgQueueId);
ICUNIT_ASSERT_EQUAL(ret, osOK, ret); ICUNIT_ASSERT_EQUAL(ret, osOK, ret);
name = osMessageQueueGetName(msgQueueId); name = (CHAR *)osMessageQueueGetName(msgQueueId);
ICUNIT_ASSERT_EQUAL(name, NULL, name); ICUNIT_ASSERT_EQUAL(name, NULL, name);
#endif #endif
@ -155,13 +155,13 @@ static VOID CmsisQueueTestThread1(VOID)
osStatus_t status; osStatus_t status;
ret = osMessageQueuePut(g_msgQueueId1, &g_strbuff1, 0U, 0U); 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); 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"); ret = strcmp(data, "world");
ICUNIT_ASSERT_EQUAL(ret, 0, ret); ICUNIT_ASSERT_EQUAL_VOID(ret, 0, ret);
} }
static VOID CmsisQueueTestThread2(VOID) static VOID CmsisQueueTestThread2(VOID)
@ -171,13 +171,13 @@ static VOID CmsisQueueTestThread2(VOID)
osStatus_t status; osStatus_t status;
status = osMessageQueueGet(g_msgQueueId1, &data, NULL, QUEUE_WAIT_TIMEOUT); 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"); 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); 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) static INT32 ThreadReadWriteTest(VOID)
@ -193,10 +193,10 @@ static INT32 ThreadReadWriteTest(VOID)
g_msgQueueId2 = osMessageQueueNew(1, strlen(g_strbuff2), &attr); g_msgQueueId2 = osMessageQueueNew(1, strlen(g_strbuff2), &attr);
ICUNIT_ASSERT_NOT_EQUAL(g_msgQueueId2, NULL, g_msgQueueId2); 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); 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); ICUNIT_ASSERT_NOT_EQUAL(threadId2, NULL, threadId2);
osThreadJoin(threadId1); osThreadJoin(threadId1);

8
testsuites/sample/kernel/queue/It_los_queue_static_004.c
View File

@ -35,17 +35,19 @@
static UINT32 Testcase(VOID) static UINT32 Testcase(VOID)
{ {
UINT32 ret; UINT32 ret;
UINT32 msgSize = (UINT32)QUEUE_BASE_MSGSIZE;
CHAR buff1[QUEUE_SHORT_BUFFER_LENGTH] = "UniDSP"; CHAR buff1[QUEUE_SHORT_BUFFER_LENGTH] = "UniDSP";
CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = {0}; CHAR buff2[QUEUE_SHORT_BUFFER_LENGTH] = {0};
CHAR buff3[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); 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); 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); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
ret = strcmp((CHAR *)buff2, (CHAR *)buff3); ret = strcmp((CHAR *)buff2, (CHAR *)buff3);

2
testsuites/unittest/posix/src/mqueue/mqueue_func_test.c
View File

@ -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 const int MAX_MQ_MSG_SIZE = 65530; // max mqueue message size
// return n: 0 < n <= max // return n: 0 < n <= max
unsigned int GetRandom(unsigned int max) static unsigned int GetRandom(unsigned int max)
{ {
if (max == 0 || max == 1) { if (max == 0 || max == 1) {
return 1; return 1;