feat:修复使用不规范的测试用例
1、在编译kernel/liteos_a测试用例时process、extended、libc三个模块出现报错,主要分为以下几种类型:
1.1、函数返回值为int或其它类型,错误使用了返回NULL的断言宏。修改断言宏返回正确的类型。
1.2、函数返回值为int或其它类型,错误的return了NULL。修改成正确的返回值类型。
1.3、waitpid函数第三个参数为int类型,错误传入了NULL。修改成正确的入参类型。
1.4、使用的断言宏传入的参数一个为int或其他类型,一个为NULL,类似不匹配。修改成匹配的类型。
1.5、testsuites/unittest/process/basic/pthread/smoke/pthread_test_012.cpp中调用Syscall接口,
第二个参数为in类型,错误的传入了NULL。修改入参为正确的类型。
2、hb set选择ipcamera_hispark_taurus,编译之后使用nfs将out/hispark_taurus/ipcamera_hispark_taurus/test/unittest/kernel/bin目录中的
9个测试用例放到单板上进行测试,运行结果全部通过,并生成对应结果从xml文件,其中liteos_a_basic_unittest.bin无xml文件生成是由于gtest框架升级引入。
Close: #I6J7QK
Signed-off-by: zhangdengyu <zhangdengyu2@huawei.com>
Change-Id: Ifa977658bfc47ba85484e06465735cdffef3dbe2
This commit is contained in:
@@ -45,11 +45,11 @@ static int TestThread(void *arg)
|
||||
int ret = 0;
|
||||
pthread_t gTh;
|
||||
ret = pthread_create(&gTh, NULL, PthreadTest115, NULL);
|
||||
ICUNIT_ASSERT_EQUAL_NULL(ret, 0, ret);
|
||||
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||
|
||||
ret = pthread_join(gTh, NULL);
|
||||
ICUNIT_ASSERT_EQUAL_NULL(ret, 0, ret);
|
||||
ICUNIT_ASSERT_EQUAL_NULL(g_usetTestCount, 1, g_usetTestCount);
|
||||
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||
ICUNIT_ASSERT_EQUAL(g_usetTestCount, 1, g_usetTestCount);
|
||||
|
||||
*g_shmptr = 100; // 100, set shared num.
|
||||
|
||||
@@ -66,11 +66,11 @@ static int TestThread(void *arg)
|
||||
ret = waitpid(pid, NULL, 0);
|
||||
printf("waitpid ret : %d errno : %d pid : %d getpid : %d\n", ret, errno, pid, getpid());
|
||||
|
||||
ICUNIT_ASSERT_EQUAL_NULL(ret, pid, ret);
|
||||
ICUNIT_ASSERT_EQUAL(ret, pid, ret);
|
||||
|
||||
*g_shmptr = data;
|
||||
EXIT:
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// This testcase us used for undefination of LOSCFG_USER_TEST_SMP
|
||||
@@ -100,7 +100,7 @@ static int Testcase(void)
|
||||
|
||||
ICUNIT_GOTO_EQUAL(*g_shmptr, arg, *g_shmptr, EXIT2);
|
||||
|
||||
ret = waitpid(pid, &status, NULL);
|
||||
ret = waitpid(pid, &status, 0);
|
||||
ICUNIT_GOTO_EQUAL(ret, pid, ret, EXIT2);
|
||||
|
||||
EXIT2:
|
||||
|
||||
@@ -39,10 +39,10 @@ static int TestThread(void *arg)
|
||||
|
||||
printf("TestThread ppid : %d g_ppid : %d\n", ppid, g_ppid);
|
||||
|
||||
ICUNIT_ASSERT_EQUAL_NULL(ppid, g_ppid, g_ppid);
|
||||
ICUNIT_ASSERT_EQUAL(ppid, g_ppid, g_ppid);
|
||||
|
||||
*g_shmptr = 100; // 100, set shared num.
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// This testcase us used for undefination of LOSCFG_USER_TEST_SMP
|
||||
@@ -55,7 +55,7 @@ static int Testcase(void)
|
||||
int ret;
|
||||
int count;
|
||||
pid_t pid;
|
||||
|
||||
|
||||
int shmid = shmget(IPC_PRIVATE, sizeof(int), IPC_CREAT | 0600); // 0600 config of shmget
|
||||
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
|
||||
|
||||
@@ -73,7 +73,7 @@ static int Testcase(void)
|
||||
stackTop = reinterpret_cast<char *>(reinterpret_cast<unsigned long>(stack) + arg);
|
||||
pid = clone(TestThread, (void *)stackTop, CLONE_PARENT, &arg);
|
||||
|
||||
ret = waitpid(pid, &status, NULL);
|
||||
ret = waitpid(pid, &status, 0);
|
||||
ICUNIT_GOTO_EQUAL(ret, -1, ret, EXIT2);
|
||||
|
||||
count = 0;
|
||||
|
||||
@@ -41,7 +41,7 @@ static int TestThread(void *arg)
|
||||
|
||||
printf("TestThread ppid : %d g_ppid : %d\n", ppid, g_ppid);
|
||||
|
||||
ICUNIT_ASSERT_EQUAL_NULL(ppid, g_ppid, g_ppid);
|
||||
ICUNIT_ASSERT_EQUAL(ppid, g_ppid, g_ppid);
|
||||
|
||||
*g_shmptr = 1000; // 1000, set shared num.
|
||||
|
||||
@@ -54,11 +54,11 @@ static int TestThread(void *arg)
|
||||
}
|
||||
|
||||
ret = waitpid(pid, NULL, 0);
|
||||
ICUNIT_ASSERT_EQUAL_NULL(ret, pid, ret);
|
||||
ICUNIT_ASSERT_EQUAL(ret, pid, ret);
|
||||
|
||||
*g_shmptr = 100; // 100, set shared num.
|
||||
EXIT:
|
||||
return NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// This testcase us used for undefination of LOSCFG_USER_TEST_SMP
|
||||
@@ -70,7 +70,7 @@ static int Testcase(void)
|
||||
void *stack;
|
||||
char *stackTop;
|
||||
int ret;
|
||||
|
||||
|
||||
int shmid = shmget(IPC_PRIVATE, sizeof(int), IPC_CREAT | 0600); // 0600 config of shmget
|
||||
ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid);
|
||||
|
||||
@@ -90,7 +90,7 @@ static int Testcase(void)
|
||||
|
||||
ICUNIT_GOTO_EQUAL(*g_shmptr, 100, *g_shmptr, EXIT2); // 100, assert g_shmptr equal to this.
|
||||
|
||||
ret = waitpid(pid, &status, NULL);
|
||||
ret = waitpid(pid, &status, 0);
|
||||
ICUNIT_GOTO_EQUAL(ret, -1, ret, EXIT2);
|
||||
|
||||
EXIT2:
|
||||
|
||||
@@ -105,7 +105,7 @@ static int Testcase(void)
|
||||
exit(Child());
|
||||
} else if (ret > 0) {
|
||||
pid = ret;
|
||||
ret = waitpid(pid, &status, NULL);
|
||||
ret = waitpid(pid, &status, 0);
|
||||
status = WEXITSTATUS(status);
|
||||
ICUNIT_ASSERT_EQUAL(ret, pid, ret);
|
||||
ICUNIT_ASSERT_EQUAL(status, 0, status);
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
static int Testcase(void)
|
||||
{
|
||||
int ret;
|
||||
ret = Syscall(SYS_set_thread_area, NULL, 0, 0, 0);
|
||||
ret = Syscall(SYS_set_thread_area, 0x0, 0, 0, 0);
|
||||
ICUNIT_ASSERT_EQUAL(ret, EINVAL, ret);
|
||||
|
||||
ret = Syscall(SYS_set_thread_area, 0x100, 0, 0, 0);
|
||||
|
||||
Reference in New Issue
Block a user