diff --git a/testsuites/unittest/posix/pthread/BUILD.gn b/testsuites/unittest/posix/pthread/BUILD.gn index f3c47594cbf9b5e4fd78de868326052cbb7f6e2f..ea47e4c52bea9a714b3bc40036b629d9ea80a0f5 100644 --- a/testsuites/unittest/posix/pthread/BUILD.gn +++ b/testsuites/unittest/posix/pthread/BUILD.gn @@ -56,7 +56,6 @@ sources_smoke = [ "smoke/It_posix_pthread_020.cpp", "smoke/It_posix_pthread_021.cpp", "smoke/It_posix_pthread_022.cpp", - "smoke/It_posix_pthread_203.cpp", ] sources_full = [ @@ -149,6 +148,7 @@ sources_full = [ "full/It_posix_pthread_193.cpp", "full/It_posix_pthread_194.cpp", "full/It_posix_pthread_200.cpp", + "full/It_posix_pthread_203.cpp", "full/It_posix_pthread_204.cpp", "full/It_posix_pthread_205.cpp", "full/It_posix_pthread_206.cpp", diff --git a/testsuites/unittest/posix/pthread/It_posix_pthread.h b/testsuites/unittest/posix/pthread/It_posix_pthread.h index 880f5dc7f3798a8275fdbb0ac37494b0f9268d88..e38f09e811dff6801051714709d7500ec11083e3 100644 --- a/testsuites/unittest/posix/pthread/It_posix_pthread.h +++ b/testsuites/unittest/posix/pthread/It_posix_pthread.h @@ -253,7 +253,6 @@ VOID ItPosixPthread019(VOID); VOID ItPosixPthread020(VOID); VOID ItPosixPthread021(VOID); VOID ItPosixPthread022(VOID); -VOID ItPosixPthread203(VOID); #endif #if defined(LOSCFG_USER_TEST_FULL) @@ -371,6 +370,7 @@ VOID ItPosixPthread194(VOID); VOID IT_POSIX_PTHREAD_197(VOID); VOID IT_POSIX_PTHREAD_198(VOID); VOID ItPosixPthread200(VOID); +VOID ItPosixPthread203(VOID); VOID ItPosixPthread204(VOID); VOID ItPosixPthread205(VOID); VOID ItPosixPthread206(VOID); diff --git a/testsuites/unittest/posix/pthread/smoke/It_posix_pthread_203.cpp b/testsuites/unittest/posix/pthread/full/It_posix_pthread_203.cpp similarity index 100% rename from testsuites/unittest/posix/pthread/smoke/It_posix_pthread_203.cpp rename to testsuites/unittest/posix/pthread/full/It_posix_pthread_203.cpp diff --git a/testsuites/unittest/posix/pthread/posix_pthread_test.cpp b/testsuites/unittest/posix/pthread/posix_pthread_test.cpp index 5b28bf5fbffdc80a13e356388e8bbed6bcbef3f7..3e490035430779530b10a2862cf28681139d83e6 100644 --- a/testsuites/unittest/posix/pthread/posix_pthread_test.cpp +++ b/testsuites/unittest/posix/pthread/posix_pthread_test.cpp @@ -327,17 +327,6 @@ HWTEST_F(PosixPthreadTest, ItPosixPthread022, TestSize.Level0) ItPosixPthread022(); // pthread_cancel } -/* * - * @tc.name: IT_POSIX_PTHREAD_203 - * @tc.desc: function for pthread concurrency - * @tc.type: FUNC - * @tc.require: AR000EEMQ9 - */ -HWTEST_F(PosixPthreadTest, ItPosixPthread203, TestSize.Level0) -{ - ItPosixPthread203(); -} - #endif #if defined(LOSCFG_USER_TEST_FULL) @@ -1267,6 +1256,17 @@ HWTEST_F(PosixPthreadTest, ItPosixPthread200, TestSize.Level0) ItPosixPthread200(); } +/* * + * @tc.name: IT_POSIX_PTHREAD_203 + * @tc.desc: function for pthread concurrency + * @tc.type: FUNC + * @tc.require: AR000EEMQ9 + */ +HWTEST_F(PosixPthreadTest, ItPosixPthread203, TestSize.Level0) +{ + ItPosixPthread203(); +} + /** * @tc.name: IT_POSIX_PTHREAD_204 * @tc.desc: function for PosixPthreadTest diff --git a/testsuites/unittest/process/mutex/BUILD.gn b/testsuites/unittest/process/mutex/BUILD.gn index 169e2caebd161104a4861c319d6cfbda6d3b4656..ec9ce5eddbbbbe7554c086e6ac6f1a381836da40 100644 --- a/testsuites/unittest/process/mutex/BUILD.gn +++ b/testsuites/unittest/process/mutex/BUILD.gn @@ -63,13 +63,14 @@ sources_smoke = [ "smoke/pthread_mutex_test_020.cpp", "smoke/pthread_mutex_test_021.cpp", "smoke/pthread_mutex_test_022.cpp", - "smoke/pthread_mutex_test_023.cpp", - "smoke/pthread_mutex_test_024.cpp", - "smoke/pthread_mutex_test_025.cpp", ] sources_full = [ "full/pthread_mutex_test_018.cpp", + "full/pthread_mutex_test_023.cpp", + "full/pthread_mutex_test_024.cpp", + "full/pthread_mutex_test_025.cpp", + ] if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { diff --git a/testsuites/unittest/process/mutex/smoke/pthread_mutex_test_023.cpp b/testsuites/unittest/process/mutex/full/pthread_mutex_test_023.cpp similarity index 100% rename from testsuites/unittest/process/mutex/smoke/pthread_mutex_test_023.cpp rename to testsuites/unittest/process/mutex/full/pthread_mutex_test_023.cpp diff --git a/testsuites/unittest/process/mutex/smoke/pthread_mutex_test_024.cpp b/testsuites/unittest/process/mutex/full/pthread_mutex_test_024.cpp similarity index 100% rename from testsuites/unittest/process/mutex/smoke/pthread_mutex_test_024.cpp rename to testsuites/unittest/process/mutex/full/pthread_mutex_test_024.cpp diff --git a/testsuites/unittest/process/mutex/smoke/pthread_mutex_test_025.cpp b/testsuites/unittest/process/mutex/full/pthread_mutex_test_025.cpp similarity index 100% rename from testsuites/unittest/process/mutex/smoke/pthread_mutex_test_025.cpp rename to testsuites/unittest/process/mutex/full/pthread_mutex_test_025.cpp diff --git a/testsuites/unittest/process/mutex/process_mutex_test.cpp b/testsuites/unittest/process/mutex/process_mutex_test.cpp index 64ccbd5696b8261ea3a8984e0234f9d92b9895b1..2df414df68b797d688f8019660930f628dbf0d43 100644 --- a/testsuites/unittest/process/mutex/process_mutex_test.cpp +++ b/testsuites/unittest/process/mutex/process_mutex_test.cpp @@ -297,5 +297,38 @@ HWTEST_F(ProcessMutexTest, ItTestPthreadMutex018, TestSize.Level0) ItTestPthreadMutex018(); } #endif + +/* * + * @tc.name: it_test_pthread_mutex_023 + * @tc.desc: function for test mutexattr robust + * @tc.type: FUNC + * @tc.require: AR000E0QAB + */ +HWTEST_F(ProcessMutexTest, ItTestPthreadMutex023, TestSize.Level0) +{ + ItTestPthreadMutex023(); +} + +/* * + * @tc.name: it_test_pthread_mutex_024 + * @tc.desc: function for test mutexattr robust:error return value + * @tc.type: FUNC + * @tc.require: AR000E0QAB + */ +HWTEST_F(ProcessMutexTest, ItTestPthreadMutex024, TestSize.Level0) +{ + ItTestPthreadMutex024(); +} + +/* * + * @tc.name: it_test_pthread_mutex_025 + * @tc.desc: test mutexattr robust:robustness product deadlock is not set + * @tc.type: FUNC + * @tc.require: AR000E0QAB + */ +HWTEST_F(ProcessMutexTest, ItTestPthreadMutex025, TestSize.Level0) +{ + ItTestPthreadMutex025(); +} #endif } // namespace OHOS