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

fix：修复函数返回错误等问题

Browse Source 
Signed-off-by: zhangdengyu <zhangdengyu2@huawei.com>
This commit is contained in:
zhangdengyu
2022-09-24 17:04:38 +08:00
parent 453c376198
commit 043e84dfcb
34 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
testsuites/unittest/libc/io/full/IO_test_epoll_001.cpp
View File

@@ -54,7 +54,7 @@ static UINT32 testcase(VOID)
UINT32 ret;
retval = pipe(pipeFd);
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT);
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT4);
/* Watch fd to see when it has input. */
FD_ZERO(&rfds);
@@ -62,11 +62,11 @@ static UINT32 testcase(VOID)
/* Wait up to three seconds. */
epFd = epoll_create1(100); /* 100, cretae input, */
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT);
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT2);
ev.events = EPOLLIN | EPOLLOUT | EPOLLRDNORM | EPOLLWRNORM;
retval = epoll_ctl(epFd, EPOLL_CTL_ADD, pipeFd[0], &ev);
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT);
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT1);
pid = fork();
if (pid == 0) {
@@ -86,7 +86,7 @@ static UINT32 testcase(VOID)
sleep(1);
close(pipeFd[0]);
retval = write(pipeFd[1], "0123456789012345678901234567890123456789", 40); /* write 40 bytes to stdin(fd 0) */
ICUNIT_GOTO_EQUAL(retval, 40, retval, OUT);
ICUNIT_GOTO_EQUAL(retval, 40, retval, OUT3);
close(pipeFd[1]);
wait(&status);
@@ -95,10 +95,20 @@ static UINT32 testcase(VOID)
}
return LOS_OK;
OUT:
OUT1:
close(epFd);
close(pipeFd[0]);
close(pipeFd[1]);
return LOS_NOK;
OUT2:
close(pipeFd[0]);
close(pipeFd[1]);
return LOS_NOK;
OUT3:
close(epFd);
close(pipeFd[1]);
return LOS_NOK;
OUT4:
return LOS_NOK;
}

14
testsuites/unittest/libc/io/full/IO_test_epoll_002.cpp
View File

@@ -53,7 +53,7 @@ static UINT32 testcase(VOID)
int i = 0;
int status;
int epFd;
int epFd = 0;
sigset_t mask;
void (*retSig)(int);
struct epoll_event ev;
@@ -75,7 +75,7 @@ static UINT32 testcase(VOID)
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
retval = pipe(pipeFd);
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT);
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT3);
/* Watch fd to see when it has input. */
FD_ZERO(&rfds);
@@ -86,12 +86,12 @@ static UINT32 testcase(VOID)
tv.tv_nsec = 5; /* 5, wait timer, nano second */
epFd = epoll_create1(100); /* 100, cretae input, */
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT);
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT2);
ev.events = EPOLLRDNORM;
retval = epoll_ctl(epFd, EPOLL_CTL_ADD, pipeFd[0], &ev);
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT);
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT1);
pid = fork();
if (pid == 0) {
@@ -125,10 +125,12 @@ static UINT32 testcase(VOID)
}
return LOS_OK;
OUT:
OUT1:
close(epFd);
OUT2:
close(pipeFd[0]);
close(pipeFd[1]);
close(epFd);
OUT3:
return LOS_NOK;
}