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

!1016 修复执行测试用例执行时间过长等问题 

Merge pull request !1016 from 夏不白/fix_unittest
This commit is contained in:
openharmony_ci 2022-10-12 06:29:16 +00:00 committed by Gitee
parent 557a71c1c3 8c0b7d0f38
commit ccdfa72431
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testsuites/unittest/basic/exc/smoke/it_test_exc_001.cpp
View File

@ -34,9 +34,11 @@ static int TestCase(void)
{ {
int ret; int ret;
int status = 0; int status = 0;
int *test = NULL; // for trggering an exception
pid_t pid = fork(); pid_t pid = fork();
ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid); ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid);
if (pid == 0) { if (pid == 0) {
*test = 0x1; // Deliberately trigger an exceptioin
exit(0); exit(0);
} }
@ -52,6 +54,7 @@ static int TestCase(void)
pid = fork(); pid = fork();
ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid); ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid);
if (pid == 0) { if (pid == 0) {
*test = 0x1; // Deliberately trigger an exceptioin
exit(0); exit(0);
} }

3
testsuites/unittest/basic/exc/smoke/it_test_exc_004.cpp
View File

@ -36,13 +36,16 @@
static int TestThread(void) static int TestThread(void)
{ {
int ret; int ret;
int *test = nullptr; // For triggering an exceptioin
pid_t pid = fork(); pid_t pid = fork();
ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid); ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid);
if (pid == 0) { if (pid == 0) {
*test = 0x1; // Deliberately trigger an exceptioin
while (1) { while (1) {
} }
} }
*test = 0x1; // Deliberately trigger an exceptioin
ret = waitpid(pid, NULL, 0); ret = waitpid(pid, NULL, 0);
ICUNIT_ASSERT_EQUAL(ret, pid, ret); ICUNIT_ASSERT_EQUAL(ret, pid, ret);

16
testsuites/unittest/basic/mem/shm/full/shm_test_002.cpp
View File

@ -37,6 +37,12 @@ static int Testcase(VOID)
int shmid[SHMID_MAX + 1] = {-1}; int shmid[SHMID_MAX + 1] = {-1};
int ret; int ret;
int i; int i;
struct shm_info shmInfo;
int leftShmIds;
ret = shmctl(0, SHM_INFO, reinterpret_cast<struct shmid_ds *>(&shmInfo));
ICUNIT_ASSERT_EQUAL(ret, SHMID_MAX, ret);
leftShmIds = SHMID_MAX - shmInfo.used_ids;
shmid[0] = shmget((key_t)0x1234, PAGE_SIZE, 0777 | IPC_CREAT); shmid[0] = shmget((key_t)0x1234, PAGE_SIZE, 0777 | IPC_CREAT);
ICUNIT_ASSERT_NOT_EQUAL(shmid[0], -1, shmid[0]); ICUNIT_ASSERT_NOT_EQUAL(shmid[0], -1, shmid[0]);
@ -50,20 +56,20 @@ static int Testcase(VOID)
ret = shmctl(shmid[0], IPC_RMID, NULL); ret = shmctl(shmid[0], IPC_RMID, NULL);
ICUNIT_ASSERT_EQUAL(ret, 0, ret); ICUNIT_ASSERT_EQUAL(ret, 0, ret);
for (i = 0; i < SHMID_MAX; i++) { for (i = 0; i < leftShmIds; i++) {
shmid[i] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT); shmid[i] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT);
ICUNIT_ASSERT_NOT_EQUAL(shmid[i], -1, shmid[i]); ICUNIT_ASSERT_NOT_EQUAL(shmid[i], -1, shmid[i]);
} }
shmid[SHMID_MAX] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT); shmid[leftShmIds] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT);
ICUNIT_ASSERT_EQUAL(shmid[SHMID_MAX], -1, shmid[SHMID_MAX]); ICUNIT_ASSERT_EQUAL(shmid[leftShmIds], -1, shmid[leftShmIds]);
for (i = 0; i < SHMID_MAX; i++) { for (i = 0; i < leftShmIds; i++) {
ret = shmctl(shmid[i], IPC_RMID, NULL); ret = shmctl(shmid[i], IPC_RMID, NULL);
ICUNIT_ASSERT_EQUAL(ret, 0, ret); ICUNIT_ASSERT_EQUAL(ret, 0, ret);
} }
for (i = 0; i < SHMID_MAX; i++) { for (i = 0; i < leftShmIds; i++) {
ret = shmctl(shmid[i], IPC_RMID, NULL); ret = shmctl(shmid[i], IPC_RMID, NULL);
ICUNIT_ASSERT_EQUAL(ret, -1, ret); ICUNIT_ASSERT_EQUAL(ret, -1, ret);
} }