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

fix: kora工具检视问题修复

Browse Source 
【背景】kora工具检视问题修复

【修改方案】
1，对部分代码问题进行整改

【影响】
对现有的产品编译不会有影响。

Signed-off-by: wangchen <wangchen64@huawei.com>
Change-Id: Iafc58b7c71e5d139e11a0ae9d98ca5a57fc6549f
This commit is contained in:
wangchen
2022-03-22 12:52:03 +00:00
parent f61ecd7669
commit 6ba17fc862
40 changed files with 146 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
testsuites/unittest/basic/dynload/smoke/dynload_test_002.cpp
View File

@@ -56,8 +56,8 @@ static int Testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
func = (int (*)(int))dlsym(handle, SYMBOL_TO_FIND);
ICUNIT_ASSERT_NOT_EQUAL(func, NULL, func);
ICUNIT_ASSERT_EQUAL(func, SYMBOL_TO_MATCH, func);
ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
ICUNIT_GOTO_EQUAL(func, SYMBOL_TO_MATCH, func, EXIT);
ret = dlclose(handle);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
@@ -66,12 +66,16 @@ static int Testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
func = (int (*)(int))dlsym(handle, SYMBOL_TO_FIND);
ICUNIT_ASSERT_NOT_EQUAL(func, NULL, func);
ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
ret = dlclose(handle);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
return 0;
EXIT:
dlclose(handle);
return 0;
}
void ItTestDynload002(void)

2
testsuites/unittest/basic/mem/shm/full/it_test_mem_100.cpp
View File

@@ -42,6 +42,8 @@ static int TestCase(void)
wchar_t *p, *pnew;
pnew = (wchar_t*)malloc(sizeof(wchar_t) * (wcslen(res) + wcslen(res1)));
ICUNIT_ASSERT_NOT_EQUAL(pnew, NULL, pnew);
p = wmempcpy(pnew, res, wcslen(res));
wmempcpy(p, res1, wcslen(res1));
flag = wmemcmp(pnew, res2, wcslen(res));

20
testsuites/unittest/basic/mem/shm/full/shm_test_013.cpp
View File

@@ -44,21 +44,27 @@ static int testcase(void)
ICUNIT_ASSERT_NOT_EQUAL(shmfd, -1, shmfd);
writebuf = (char*)malloc(pageSize);
ICUNIT_ASSERT_NOT_EQUAL(writebuf, NULL, writebuf);
ICUNIT_ASSERT_NOT_EQUAL(writebuf, NULL, writebuf);
readbuf = (char*)malloc(pageSize);
ICUNIT_ASSERT_NOT_EQUAL(readbuf, NULL, readbuf);
ICUNIT_GOTO_NOT_EQUAL(readbuf, NULL, readbuf, EXIT);
(void)memset_s(writebuf, pageSize, 0xf, pageSize);
count = write(shmfd, writebuf, pageSize);
ICUNIT_ASSERT_EQUAL(count, pageSize, count);
ICUNIT_GOTO_EQUAL(count, pageSize, count, EXIT);
ret = lseek(shmfd, 0, SEEK_SET);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
count = read(shmfd, readbuf, pageSize);
ICUNIT_ASSERT_EQUAL(count, pageSize, count);
free(readbuf);
free(writebuf);
ICUNIT_GOTO_EQUAL(count, pageSize, count, EXIT);
EXIT:
if (readbuf != NULL) {
free(readbuf);
}
if (writebuf != NULL) {
free(writebuf);
}
close(shmfd);
ret = shm_unlink("test_1");
return 0;

31
testsuites/unittest/basic/mem/vm/mem_vm_test.cpp
View File

@@ -51,37 +51,6 @@ HWTEST_F(MemVmTest, ItTestMmap001, TestSize.Level0)
{
ItTestMmap001();
}
#if 0 // need tmpfs
/* *
* @tc.name: it_test_mmap_002
* @tc.desc: function for MemVmTest
* @tc.type: FUNC
*/
HWTEST_F(MemVmTest, ItTestMmap002, TestSize.Level0)
{
ItTestMmap002();
}
/* *
* @tc.name: it_test_mmap_003
* @tc.desc: function for MemVmTest
* @tc.type: FUNC
*/
HWTEST_F(MemVmTest, ItTestMmap003, TestSize.Level0)
{
ItTestMmap003();
}
/* *
* @tc.name: it_test_mmap_004
* @tc.desc: function for MemVmTest
* @tc.type: FUNC
*/
HWTEST_F(MemVmTest, ItTestMmap004, TestSize.Level0)
{
ItTestMmap004();
}
#endif
/* *
* @tc.name: it_test_mmap_005

6
testsuites/unittest/basic/mem/vm/smoke/mmap_test_002.cpp
View File

@@ -76,8 +76,10 @@ static int Testcase(void)
(void)memset_s(buf, pageSize, 0xf, pageSize);
count = write(shmfd, buf, pageSize);
ICUNIT_ASSERT_EQUAL(count, pageSize, count);
if (count != pageSize) {
free(buf);
ICUNIT_ASSERT_EQUAL(count, pageSize, count);
}
free(buf);
/* Simple MAP_ANONYMOUS */

26
testsuites/unittest/extended/ipc/ipc_test.cpp
View File

@@ -40,30 +40,4 @@ public:
static void SetUpTestCase(void) {}
static void TearDownTestCase(void) {}
};
#if defined(LOSCFG_USER_TEST_FULL)
/* *
* @tc.name: IPC_TEST_MKFIFOAT_001
* @tc.desc: function for IoTest:mkfifoat-normal test
* @tc.type: FUNC
*/
#if 0
HWTEST_F(IoTest, IPC_TEST_MKFIFOAT_001, TestSize.Level0)
{
IPC_TEST_MKFIFOAT_001();
}
#endif
/* *
* @tc.name: IPC_TEST_MKFIFOAT_002
* @tc.desc: function for IoTest:mkfifoat-innormal test
* @tc.type: FUNC
*/
#if 0
HWTEST_F(IoTest, IPC_TEST_MKFIFOAT_002, TestSize.Level0)
{
IPC_TEST_MKFIFOAT_002();
}
#endif
#endif
} // namespace OHOS

6
testsuites/unittest/extended/signal/smoke/mkfifo_test_001.cpp
View File

@@ -56,11 +56,17 @@ static int TestMkfifo()
return -1;
} else if (pid == 0) {
fd = open("/dev/fifo", O_WRONLY);
if (fd < 0) {
return -1;
}
write(fd, sentence, sizeof(sentence) + 1);
close(fd);
exit(0);
} else {
fd = open("/dev/fifo", O_RDONLY);
if (fd < 0) {
return -1;
}
read(fd, buffer, sizeof(buffer));
printf("Receive data: %s\n", buffer);
close(fd);

2
testsuites/unittest/libc/io/full/It_stdio_fwprintf_001.cpp
View File

@@ -60,6 +60,8 @@ static UINT32 Testcase(VOID)
fclose(testFile);
testFile = fopen(pathname, "r");
ICUNIT_GOTO_NOT_EQUAL(testFile, NULL, testFile, EXIT);
p = fgetws(tarStr, 16, testFile); // 16， read size,total write and '\0'
nRet = wcscmp(L"hello world 666", tarStr);
ICUNIT_GOTO_EQUAL(nRet, 0, nRet, EXIT);

4
testsuites/unittest/libc/io/full/It_stdio_hasmntopt_001.cpp
View File

@@ -55,6 +55,10 @@ static UINT32 testcase(VOID)
}
mnt_new = (struct mntent *)malloc(sizeof(struct mntent));
if (mnt_new == NULL) {
(VOID)RecoveryFileEnv(pathList, 1);
return LOS_NOK;
}
mnt_new->mnt_fsname = "UUID=c4992556-a86e-45e8-ba5f-190b16a9073x";
mnt_new->mnt_dir = "/usr1";
mnt_new->mnt_type = "ext3";

2
testsuites/unittest/libc/io/full/It_stdio_putwc_001.cpp
View File

@@ -55,6 +55,8 @@ static UINT32 Testcase(VOID)
fclose(putwcFile);
putwcFile = fopen(pathname, "r");
ICUNIT_GOTO_NOT_EQUAL(putwcFile, NULL, putwcFile, EXIT);
tarWc = getwc(putwcFile);
ICUNIT_GOTO_EQUAL(tarWc, L'H', tarWc, EXIT);

2
testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_134.cpp
View File

@@ -44,8 +44,6 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1);
ICUNIT_GOTO_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1);
ret = mq_close(mqueue);
ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1);

2
testsuites/unittest/libc/posix/pthread/full/It_posix_pthread_044.cpp
View File

@@ -43,7 +43,6 @@ static VOID *pthread_f02(void *argument)
ret = pthread_getschedparam(pthread_self(), &policy, &param);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ICUNIT_GOTO_EQUAL(policy, SCHED_RR, policy, EXIT); //
ICUNIT_GOTO_EQUAL(param.sched_priority, 3, param.sched_priority, EXIT);
@@ -63,7 +62,6 @@ static VOID *pthread_f01(void *argument)
ret = pthread_getschedparam(pthread_self(), &policy, &param);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ICUNIT_GOTO_EQUAL(policy, SCHED_RR, policy, EXIT); //
ICUNIT_GOTO_EQUAL(param.sched_priority, 4, param.sched_priority, EXIT);

2
testsuites/unittest/libc/sys/smoke/sys_test_007.cpp
View File

@@ -43,7 +43,7 @@ static UINT32 TestCase(VOID)
ICUNIT_GOTO_NOT_EQUAL(p, NULL, p, EXIT);
x = drand48();
printf("x= %d\n", x);
printf("x= %lf\n", x);
return 0;
EXIT:

12
testsuites/unittest/libc/sys/smoke/sys_test_030.cpp
View File

@@ -42,18 +42,6 @@ static void sig_alarm(int signum)
static UINT32 TestCase(VOID)
{
#if 0
int alarm_time = 1;
int ret;
signal(SIGALRM, sig_alarm);
alarm(alarm_time);
ret = sigsetjmp(jmp_env, 1);
if (ret) {
ICUNIT_ASSERT_EQUAL(ret, val, ret);
}
sleep(3);
#endif
return 0;
}

3
testsuites/unittest/libc/util/smoke/util_test_003.cpp
View File

@@ -48,6 +48,9 @@ static UINT32 TestCase(VOID)
NULL
};
CHAR *buf = (char *)malloc(TEST_BUF_SIZE);
if (buf == NULL) {
return -1;
}
CHAR *a = TEST_STR;
CHAR *value = NULL;
CHAR *subopts = NULL;

6
testsuites/unittest/libc/util/smoke/util_test_007.cpp
View File

@@ -87,11 +87,13 @@ static UINT32 TestCase(VOID)
ptr = (int *)Xmalloc(sizeof(int));
*ptr = rand() & 0xff;
val = tsearch((void *)ptr, &g_root, Compare);
if (val == NULL)
if (val == NULL) {
exit(EXIT_FAILURE);
else if ((*(int **)val) != ptr)
} else if ((*(int **)val) != ptr) {
free(ptr);
}
}
twalk(g_root, Action);
tdestroy(g_root, free);

16
testsuites/unittest/net/socket/smoke/net_socket_test_003.cpp
View File

@@ -83,7 +83,7 @@ static int SampleTcpServer()
ICUNIT_ASSERT_NOT_EQUAL(sfd, -1, sfd);
/* send */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, SRV_MSG);
@@ -94,7 +94,7 @@ static int SampleTcpServer()
ICUNIT_ASSERT_EQUAL(ret, strlen(SRV_MSG), ret);
/* recv */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = recv(sfd, gBuf, sizeof(gBuf), 0);
@@ -107,7 +107,7 @@ static int SampleTcpServer()
clnAddr.sin_family = AF_INET;
clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
clnAddr.sin_port = htons(PEER_PORT);
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, SRV_MSG);
@@ -128,7 +128,7 @@ static int SampleTcpServer()
Wait();
/* recvmsg */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = memset_s(&msg, sizeof(msg), 0, sizeof(msg));
@@ -196,7 +196,7 @@ static int SampleTcpClient()
inet_addr(STACK_IP), ((struct sockaddr_in*)&addr)->sin_addr.s_addr);
/* send */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, CLI_MSG);
@@ -207,7 +207,7 @@ static int SampleTcpClient()
ICUNIT_ASSERT_EQUAL(ret, strlen(CLI_MSG), ret);
/* recv */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = recv(sfd, gBuf, sizeof(gBuf), 0);
@@ -220,7 +220,7 @@ static int SampleTcpClient()
clnAddr.sin_family = AF_INET;
clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
clnAddr.sin_port = htons(PEER_PORT);
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, CLI_MSG);
@@ -241,7 +241,7 @@ static int SampleTcpClient()
Wait();
/* recvmsg */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = memset_s(&msg, sizeof(msg), 0, sizeof(msg));

10
testsuites/unittest/net/socket/smoke/net_socket_test_007.cpp
View File

@@ -139,13 +139,17 @@ static int TcpTest()
} else {
printf("malloc 20M success\n");
ret = memset_s(buf, bufSiz, 0, bufSiz);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = send(lsfd, buf, bufSiz, 0);
printf("send ret = %d, errno :%d\n", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_GOTO_EQUAL(ret, -1, ret, EXIT);
}
EXIT:
if (buf != NULL) {
free(buf);
}
#endif
close(lsfd);
return 0;
}

3
testsuites/unittest/process/basic/process/full/process_test_066.cpp
View File

@@ -149,6 +149,9 @@ static int TestSpawnAttr(short flag)
ICUNIT_GOTO_EQUAL(status, 0, status, EXIT);
fd = open("/storage/testspawnattr.txt", O_RDWR | O_CREAT, 0644); // 0644, open config
if (fd < 0) {
goto EXIT;
}
ret = read(fd, temp, NUMMAX);
ICUNIT_GOTO_EQUAL(ret, NUMMAX, ret, EXIT1);

1
testsuites/unittest/process/basic/process/smoke/process_test_046.cpp
View File

@@ -51,7 +51,6 @@ static int Testcase(void)
CPU_SET(1, &cpuset); /* cpu1 unsupported operation */
ret = sched_setaffinity(getpid(), sizeof(cpu_set_t), &cpuset);
ICUNIT_GOTO_EQUAL(ret, -1, ret, ERROR_OUT);
CPU_ZERO(&cpuset);
CPU_ZERO(&cpuset);
CPU_SET(0, &cpuset); /* cpu0 */

7
testsuites/unittest/security/vid/smoke/vid_test_001.cpp
View File

@@ -55,7 +55,14 @@ static void ChildFunc()
ent.sigev_signo = SIGUSR1;
tid2 = (timer_t *)malloc(sizeof(UINTPTR) * 1024);
if (tid2 == NULL) {
return;
}
ret1 = (int *)malloc(sizeof(int) * 1024);
if (ret1 == NULL) {
free(tid2);
return;
}
(void)memset_s(tid2, sizeof(char *) * 1024, 0, sizeof(char *) * 1024);
(void)memset_s(ret1, sizeof(int) * 1024, 0xff, sizeof(int) * 1024);
while (i < 1024) {