diff --git a/testsuites/sample/cmsis/cmsis_func_test.c b/testsuites/sample/cmsis/cmsis_func_test.c index 0bcfc9f9..f11604ec 100644 --- a/testsuites/sample/cmsis/cmsis_func_test.c +++ b/testsuites/sample/cmsis/cmsis_func_test.c @@ -352,15 +352,10 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1) ret = strcmp(staticBuff, strbuff); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); - ret = osMessageQueueDelete(msgQueueId); - ICUNIT_ASSERT_EQUAL(ret, osOK, ret); -#endif - return LOS_OK; - EXIT: ret = osMessageQueueDelete(msgQueueId); ICUNIT_ASSERT_EQUAL(ret, osOK, ret); - +#endif return LOS_OK; } diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_004.c b/testsuites/sample/kernel/atomic/it_los_atomic_004.c index fdd7ae6e..e7cc8de2 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_004.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_004.c @@ -46,7 +46,7 @@ static VOID TaskF01(VOID) ICUNIT_ASSERT_EQUAL_VOID(g_testAtomicID03, i, g_testAtomicID03); ICUNIT_ASSERT_EQUAL_VOID(ret, g_testAtomicID03, ret); - LOS_AtomicAdd(&g_testCount, 1); + LOS_AtomicAdd((Atomic *)(&g_testCount), 1); } static UINT32 TestCase(VOID) diff --git a/testsuites/sample/kernel/event/It_los_event_006.c b/testsuites/sample/kernel/event/It_los_event_006.c index a1fd62fa..8a95dc26 100644 --- a/testsuites/sample/kernel/event/It_los_event_006.c +++ b/testsuites/sample/kernel/event/It_los_event_006.c @@ -33,7 +33,7 @@ #include "osTest.h" #include "It_los_event.h" -static VOID TaskF01() +static VOID TaskF01(VOID) { UINT32 ret; diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_032.c b/testsuites/sample/kernel/hwi/it_los_hwi_032.c index d9197314..85be7b68 100644 --- a/testsuites/sample/kernel/hwi/it_los_hwi_032.c +++ b/testsuites/sample/kernel/hwi/it_los_hwi_032.c @@ -47,6 +47,7 @@ static int g_uwIndex; #else #define TEST_MAX_NUMBER_HWI (OS_USER_HWI_MAX - HWI_NUM_INT0) #define TEST_HWI_COUNT (TEST_MAX_NUMBER_HWI - 2) +#undef HWI_NUM_INT0 #define HWI_NUM_INT0 HWI_NUM_INT1 #endif diff --git a/testsuites/sample/kernel/hwi/it_los_hwi_033.c b/testsuites/sample/kernel/hwi/it_los_hwi_033.c index cd07c0fc..21340c0e 100644 --- a/testsuites/sample/kernel/hwi/it_los_hwi_033.c +++ b/testsuites/sample/kernel/hwi/it_los_hwi_033.c @@ -43,6 +43,7 @@ static VOID HwiF01(VOID) return; } +#undef HWI_NUM_INT0 #define HWI_NUM_INT0 HWI_NUM_TEST1 static UINT32 Testcase(VOID) { diff --git a/testsuites/sample/kernel/power/It_los_pm_002.c b/testsuites/sample/kernel/power/It_los_pm_002.c index 69911f12..74afbf79 100644 --- a/testsuites/sample/kernel/power/It_los_pm_002.c +++ b/testsuites/sample/kernel/power/It_los_pm_002.c @@ -33,7 +33,7 @@ #include "los_timer.h" #include "los_sched.h" -#define myprintf // printf +#define myprintf printf #define TEST_LOOP 5 static EVENT_CB_S g_pmTestEvent; static UINT32 g_taskID1, g_taskID2; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr.c b/testsuites/sample/kernel/swtmr/It_los_swtmr.c index 790f2226..8514fafe 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr.c @@ -36,6 +36,15 @@ EVENT_CB_S g_eventCB0; EVENT_CB_S g_eventCB1; EVENT_CB_S g_eventCB2; EVENT_CB_S g_eventCB3; +UINT32 g_swtmrId1; +UINT32 g_swtmrId2; +UINT32 g_swtmrId3; +UINT32 g_swtmrCountA; +UINT32 g_swtmrCountB; +UINT32 g_swtmrCountC; +UINT32 g_uwsTick1; +UINT32 g_uwsTick2; +UINT32 g_uwsTick3; VOID ItSuiteLosSwtmr(void) { diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr.h b/testsuites/sample/kernel/swtmr/It_los_swtmr.h index a4416cad..db83abde 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr.h +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr.h @@ -56,17 +56,17 @@ extern EVENT_CB_S g_eventCB3; extern UINT32 g_idleTaskID; -static UINT32 g_swtmrId1; -static UINT32 g_swtmrId2; -static UINT32 g_swtmrId3; +extern UINT32 g_swtmrId1; +extern UINT32 g_swtmrId2; +extern UINT32 g_swtmrId3; -static UINT32 g_swtmrCountA; -static UINT32 g_swtmrCountB; -static UINT32 g_swtmrCountC; +extern UINT32 g_swtmrCountA; +extern UINT32 g_swtmrCountB; +extern UINT32 g_swtmrCountC; -static UINT32 g_uwsTick1; -static UINT32 g_uwsTick2; -static UINT32 g_uwsTick3; +extern UINT32 g_uwsTick1; +extern UINT32 g_uwsTick2; +extern UINT32 g_uwsTick3; extern VOID LOS_GetCpuTick(UINT32 *puwCntHi, UINT32 *puwCntLo); extern VOID ItSuiteLosSwtmr(VOID); diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c index bc04c532..42e49de6 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_022.c @@ -48,7 +48,7 @@ static VOID Case1(UINT32 arg) return; } -static VOID Case2() +static VOID Case2(VOID) { UINT32 ret; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c index c18cf695..0e1040a4 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_023.c @@ -44,7 +44,7 @@ static VOID Case1(UINT32 arg) return; } -static VOID Case2() +static VOID Case2(VOID) { UINT32 ret; UINT32 uwloop = 1000; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_031.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_031.c index 37b91cae..bc258884 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_031.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_031.c @@ -41,7 +41,7 @@ static VOID Case1(UINT32 arg) g_testCount = 30; } -static VOID Case2() +static VOID Case2(VOID) { // 10, Here, assert that g_testCount is equal to this . ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 10, g_testCount); @@ -49,7 +49,7 @@ static VOID Case2() g_testCount = 20; } -static VOID Case3() +static VOID Case3(VOID) { // 10, Set the number to determine whether the process is as expected. g_testCount = 10; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_032.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_032.c index 4eb65b76..5b53a046 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_032.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_032.c @@ -51,7 +51,7 @@ EXIT: LOS_TaskDelete(g_testTaskID01); } -static VOID Case2() +static VOID Case2(VOID) { UINT32 ret; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c index c194c65a..f64ec24c 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_033.c @@ -50,14 +50,14 @@ static VOID Case1(UINT32 arg) g_testCount = 10; } -static VOID Case2() +static VOID Case2(VOID) { // 20, Here, assert that g_testCount is equal to this . ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 20, g_testCount); g_testCount++; } -static VOID Case3() +static VOID Case3(VOID) { UINT32 index; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_035.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_035.c index fd921174..20cb37b2 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_035.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_035.c @@ -33,7 +33,7 @@ #include "It_los_swtmr.h" -static VOID Case1() +static VOID Case1(VOID) { UINT32 ret; @@ -43,7 +43,7 @@ static VOID Case1() } } -static VOID Case2() +static VOID Case2(VOID) { UINT32 ret; @@ -53,7 +53,7 @@ static VOID Case2() } } -static VOID Case3() +static VOID Case3(VOID) { UINT32 ret; @@ -64,7 +64,7 @@ static VOID Case3() } } -VOID Case4() +static VOID Case4(VOID) { UINT32 ret; @@ -77,7 +77,7 @@ VOID Case4() } } -VOID Case5() +static VOID Case5(VOID) { UINT32 ret; @@ -90,7 +90,7 @@ VOID Case5() } } -VOID Case6() +static VOID Case6(VOID) { UINT32 ret; diff --git a/testsuites/sample/posix/mqueue/It_posix_queue.c b/testsuites/sample/posix/mqueue/It_posix_queue.c index abecfd71..94957870 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue.c @@ -41,6 +41,7 @@ mqd_t g_mqueueId[LOSCFG_BASE_IPC_QUEUE_CONFIG + 1]; SEM_HANDLE_T g_mqueueSem; mqd_t g_messageQId; mqd_t g_gqueue; +TSK_HANDLE_T g_mqueueTaskPID; VOID TestAssertWaitDelay(UINT32 *testCount, UINT32 flag) { diff --git a/testsuites/sample/posix/mqueue/It_posix_queue.h b/testsuites/sample/posix/mqueue/It_posix_queue.h index 6a931dda..273c0224 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue.h +++ b/testsuites/sample/posix/mqueue/It_posix_queue.h @@ -57,18 +57,19 @@ #define MQUEUE_PRIORITY_TEST 0 #define MQUEUE_TIMEOUT_TEST 7 #define MQUEUE_PRIORITY_NUM_TEST 3 -#define MQUEUE_MAX_NUM_TEST (LOSCFG_BASE_IPC_QUEUE_CONFIG - QUEUE_EXISTED_NUM) #define MQ_MAX_MSG_NUM 16 #define MQ_MAX_MSG_LEN 64 +#undef HWI_NUM_TEST #define HWI_NUM_TEST 1 +#undef HWI_NUM_TEST1 #define HWI_NUM_TEST1 2 #if (LOSCFG_LIBC_NEWLIB == 1) #define MQ_PRIO_MAX 1 #endif +#undef LOSCFG_BASE_IPC_QUEUE_CONFIG #define LOSCFG_BASE_IPC_QUEUE_CONFIG 1024 - #define LOS_AtomicInc(a) (++*(a)) #define MqueueTaskDelay(tick) (usleep((tick) * 10000)) @@ -91,7 +92,7 @@ typedef UINT32 SEM_HANDLE_T ; extern SEM_HANDLE_T g_mqueueSem; -static TSK_HANDLE_T g_mqueueTaskPID; +extern TSK_HANDLE_T g_mqueueTaskPID; extern CHAR g_gqname[MQUEUE_STANDARD_NAME_LENGTH]; extern CHAR g_mqueueName[LOSCFG_BASE_IPC_QUEUE_CONFIG + 1][MQUEUE_STANDARD_NAME_LENGTH]; extern mqd_t g_mqueueId[LOSCFG_BASE_IPC_QUEUE_CONFIG + 1]; diff --git a/testsuites/sample/posix/mqueue/It_posix_queue_030.c b/testsuites/sample/posix/mqueue/It_posix_queue_030.c index 0d88d590..f5124d22 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue_030.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue_030.c @@ -34,8 +34,6 @@ static UINT32 Testcase(VOID) CHAR qname[MQUEUE_STANDARD_NAME_LENGTH] = ""; const CHAR *msgptr = MQUEUE_SEND_STRING_TEST; mqd_t queue; - INT32 unresolved = 0; - INT32 failure = 0; INT32 ret = 0; ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ diff --git a/testsuites/sample/posix/mqueue/It_posix_queue_039.c b/testsuites/sample/posix/mqueue/It_posix_queue_039.c index a56d0dee..99be503e 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue_039.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue_039.c @@ -34,8 +34,6 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH], msgrv[MQUEUE_STANDARD_NAME_LENGTH]; mqd_t mqdes; struct mq_attr attr = {0}; - INT32 unresolved = 0; - INT32 failure = 0; INT32 ret = 0; ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ diff --git a/testsuites/sample/posix/mqueue/It_posix_queue_041.c b/testsuites/sample/posix/mqueue/It_posix_queue_041.c index 7262e679..13247092 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue_041.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue_041.c @@ -35,8 +35,6 @@ static UINT32 Testcase(VOID) mqd_t mqdes; CHAR msgrv[MQUEUE_STANDARD_NAME_LENGTH]; struct mq_attr attr = {0}; - INT32 unresolved = 0; - INT32 failure = 0; INT32 ret = 0; ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ diff --git a/testsuites/sample/posix/mqueue/It_posix_queue_043.c b/testsuites/sample/posix/mqueue/It_posix_queue_043.c index 94181daf..cfd99054 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue_043.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue_043.c @@ -34,8 +34,6 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqdes; struct mq_attr mqstat; - INT32 unresolved = 0; - INT32 failure = 0; INT32 ret = 0; ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ diff --git a/testsuites/sample/posix/mqueue/It_posix_queue_045.c b/testsuites/sample/posix/mqueue/It_posix_queue_045.c index 703195c9..463fa28a 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue_045.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue_045.c @@ -34,8 +34,6 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqdes; struct mq_attr mqstat, nmqstat; - INT32 unresolved = 0; - INT32 failure = 0; INT32 ret = 0; ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ diff --git a/testsuites/sample/posix/mqueue/It_posix_queue_048.c b/testsuites/sample/posix/mqueue/It_posix_queue_048.c index 7002ae78..baa7c787 100644 --- a/testsuites/sample/posix/mqueue/It_posix_queue_048.c +++ b/testsuites/sample/posix/mqueue/It_posix_queue_048.c @@ -35,8 +35,6 @@ static UINT32 Testcase(VOID) mqd_t mqdes; struct mq_attr mqstat = {0}; struct mq_attr nmqstat = {0}; - INT32 unresolved = 0; - INT32 failure = 0; INT32 ret = 0; ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ diff --git a/testsuites/sample/posix/mutex/It_posix_mutex.h b/testsuites/sample/posix/mutex/It_posix_mutex.h index f7806382..cfd9aa04 100644 --- a/testsuites/sample/posix/mutex/It_posix_mutex.h +++ b/testsuites/sample/posix/mutex/It_posix_mutex.h @@ -38,23 +38,7 @@ #include "semaphore.h" #include "unistd.h" -#ifdef LOSCFG_DEBUG_DEADLOCK -#define TEST_MUTEX_INIT \ - { \ - { 0, 0, 0, 0 }, \ - { \ - { 0, 0 }, { 0, 0 }, 0, 0 \ - } \ - } -#else -#define TEST_MUTEX_INIT \ - { \ - { 0, 0, 0, 0 }, \ - { \ - { 0, 0 }, 0, 0 \ - } \ - } -#endif +#define TEST_MUTEX_INIT {0} #define MUTEX_TEST_DEFAULT_PRIO LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO #define MUTEX_TEST_HIGH_PRIO (MUTEX_TEST_DEFAULT_PRIO - 6) diff --git a/testsuites/sample/posix/pthread/It_posix_pthread.h b/testsuites/sample/posix/pthread/It_posix_pthread.h index be4c7157..26d764b3 100644 --- a/testsuites/sample/posix/pthread/It_posix_pthread.h +++ b/testsuites/sample/posix/pthread/It_posix_pthread.h @@ -42,11 +42,6 @@ #include "mqueue.h" #include "signal.h" -/* Some routines are part of the XSI Extensions */ -#ifndef WITHOUT_XOPEN -#define _XOPEN_SOURCE 600 -#endif - #define PTHREAD_IS_ERROR (-1) #define PTHREAD_PRIORITY_TEST 20 #define PTHREAD_DEFAULT_STACK_SIZE (LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE) @@ -71,9 +66,6 @@ /* We are testing conformance to IEEE Std 1003.1, 2003 Edition */ #define _POSIX_C_SOURCE 200112L -#define PTHREAD_MUTEX_RECURSIVE 0 -#define PTHREAD_MUTEX_ERRORCHECK 0 - #define PRIORITY_OTHER (-1) #define PRIORITY_FIFO 20 #define PRIORITY_RR 20 diff --git a/testsuites/src/iCunit.c b/testsuites/src/iCunit.c index 8a96e1a1..e9578c79 100644 --- a/testsuites/src/iCunit.c +++ b/testsuites/src/iCunit.c @@ -102,7 +102,7 @@ char *g_strType[] = { "FUNCTION", "PRESSURE", "PERFORMANCE" }; -iUINT32 ICunitRunF() +iUINT32 ICunitRunF(void) { iUINT32 idx, idx1; ICUNIT_CASE_S *psubCaseArray; diff --git a/testsuites/src/osTest.c b/testsuites/src/osTest.c index 62a60a72..cd214d66 100644 --- a/testsuites/src/osTest.c +++ b/testsuites/src/osTest.c @@ -231,7 +231,7 @@ void TestCmsis2(void) } #endif -VOID TestTaskEntry() +VOID TestTaskEntry(VOID) { PRINTF("\t\n --- Test Start --- \n\n"); ICunitInit(); diff --git a/testsuites/unittest/posix/BUILD.gn b/testsuites/unittest/posix/BUILD.gn index 26ac5a97..e3d769a8 100644 --- a/testsuites/unittest/posix/BUILD.gn +++ b/testsuites/unittest/posix/BUILD.gn @@ -68,7 +68,10 @@ static_library("posix_test") { sources += [ "src/fs/posix_fs_func_test.c" ] } if (!defined(LOSCFG_COMPILER_ICCARM)) { - cflags = [ "-Wno-error" ] + cflags = [ + "-Wno-error", + "-Wno-unused-function", + ] } else { cflags = [ "--no_warnings" ] } diff --git a/testsuites/unittest/posix/src/common_test.h b/testsuites/unittest/posix/src/common_test.h deleted file mode 100644 index 44585ecf..00000000 --- a/testsuites/unittest/posix/src/common_test.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. - * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef COMMON_TEST_H -#define COMMON_TEST_H - -#define TESTCOUNT_NUM_1 1 -#define TESTCOUNT_NUM_2 2 -#define TESTCOUNT_NUM_3 3 -#define TESTCOUNT_NUM_4 4 -#define TESTCOUNT_NUM_5 5 - -#define DELAY_TICKS_1 1 -#define DELAY_TICKS_5 5 -#define DELAY_TICKS_10 10 - -#define TEST_TASK_STACK_SIZE 0x600 -#define TASK_LOOP_NUM 0x10000000 -#define TEST_TIME 10 -#define THREAD_COUNT_MIN 3 -#define THREAD_COUNT_MAX 30 -#define THREAD_STACK_SPACE_MAX 4096 - -#ifdef __cplusplus -#if __cplusplus -#endif -#endif /* __cplusplus */ -#endif diff --git a/testsuites/unittest/posix/src/kernel_test.h b/testsuites/unittest/posix/src/kernel_test.h index e98387d0..b59c16d9 100644 --- a/testsuites/unittest/posix/src/kernel_test.h +++ b/testsuites/unittest/posix/src/kernel_test.h @@ -42,8 +42,6 @@ #define DELAY_TICKS_5 5 #define DELAY_TICKS_10 10 -#define TEST_TASK_STACK_SIZE 0x600 -#define TASK_LOOP_NUM 0x10000000 #define TEST_TIME 10 #define THREAD_COUNT_MIN 3 #define THREAD_COUNT_MAX 30 diff --git a/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c b/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c index 9d78ea92..2c4c3220 100644 --- a/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c +++ b/testsuites/unittest/posix/src/mqueue/mqueue_func_test.c @@ -33,7 +33,6 @@ #include "posix_test.h" #include #include -#include "common_test.h" #include "kernel_test.h" #include "log.h" diff --git a/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c b/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c index 27cb8477..6637614c 100644 --- a/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c +++ b/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c @@ -34,7 +34,6 @@ #include "hctest.h" #include "los_config.h" #include "cmsis_os2.h" -#include "common_test.h" #include "kernel_test.h" #include "pthread.h" #include "log.h"