From 290a3c6f92ce437f2aa80a22805327f1ad6476dd Mon Sep 17 00:00:00 2001 From: vcbchang Date: Tue, 22 Jun 2021 17:23:40 +0800 Subject: [PATCH] =?UTF-8?q?test:=20mqueue144=E4=B8=8Emutex18=E9=97=A8?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E4=BE=8B=E4=B8=8D=E7=A8=B3=E5=AE=9A=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E4=B8=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】mqueue144与mutex18门禁用例不稳定暂时下线 【修改方案】 将ItPosixQueue144.cpp与ItTestPthreadMutex018.cpp门禁用例暂时放入全量用例里面 re: #I3X4PR Signed-off-by: vcbchang Change-Id: I470c6bde70aa2b5956ac50a93f56776901774618 --- testsuites/unittest/posix/mqueue/BUILD.gn | 2 +- .../{smoke => full}/It_posix_queue_144.cpp | 0 .../posix/mqueue/posix_mqueue_test.cpp | 22 +++++----------- testsuites/unittest/process/mutex/BUILD.gn | 2 +- .../pthread_mutex_test_018.cpp | 0 .../process/mutex/process_mutex_test.cpp | 26 +++++++++++-------- 6 files changed, 23 insertions(+), 29 deletions(-) rename testsuites/unittest/posix/mqueue/{smoke => full}/It_posix_queue_144.cpp (100%) rename testsuites/unittest/process/mutex/{smoke => full}/pthread_mutex_test_018.cpp (100%) diff --git a/testsuites/unittest/posix/mqueue/BUILD.gn b/testsuites/unittest/posix/mqueue/BUILD.gn index eba2e20d..2c570c94 100644 --- a/testsuites/unittest/posix/mqueue/BUILD.gn +++ b/testsuites/unittest/posix/mqueue/BUILD.gn @@ -51,7 +51,6 @@ sources_smoke = [ "smoke/It_posix_queue_003.cpp", "smoke/It_posix_queue_028.cpp", "smoke/It_posix_queue_053.cpp", - "smoke/It_posix_queue_144.cpp", "smoke/It_posix_queue_062.cpp", "smoke/It_posix_queue_205.cpp", "smoke/It_posix_queue_206.cpp", @@ -167,6 +166,7 @@ sources_full = [ "full/It_posix_queue_134.cpp", "full/It_posix_queue_136.cpp", "full/It_posix_queue_143.cpp", + "full/It_posix_queue_144.cpp", "full/It_posix_queue_145.cpp", "full/It_posix_queue_146.cpp", "full/It_posix_queue_147.cpp", diff --git a/testsuites/unittest/posix/mqueue/smoke/It_posix_queue_144.cpp b/testsuites/unittest/posix/mqueue/full/It_posix_queue_144.cpp similarity index 100% rename from testsuites/unittest/posix/mqueue/smoke/It_posix_queue_144.cpp rename to testsuites/unittest/posix/mqueue/full/It_posix_queue_144.cpp diff --git a/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp b/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp index 794a63a2..49475701 100644 --- a/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp +++ b/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp @@ -144,17 +144,6 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue053, TestSize.Level0) ItPosixQueue053(); } -/* * - * @tc.name: IT_POSIX_QUEUE_144 - * @tc.desc: function for PosixMqueueTest - * @tc.type: FUNC - * @tc.require: AR000EEMQ9 - */ -HWTEST_F(PosixMqueueTest, ItPosixQueue144, TestSize.Level0) -{ - ItPosixQueue144(); -} - /* * * @tc.name: IT_POSIX_QUEUE_028 * @tc.desc: function for PosixMqueueTest @@ -1089,15 +1078,16 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue130, TestSize.Level0) ItPosixQueue130(); } -/** - * @tc.name: IT_POSIX_QUEUE_133 +/* * + * @tc.name: IT_POSIX_QUEUE_144 * @tc.desc: function for PosixMqueueTest * @tc.type: FUNC * @tc.require: AR000EEMQ9 */ -/* - -*/ +HWTEST_F(PosixMqueueTest, ItPosixQueue144, TestSize.Level0) +{ + ItPosixQueue144(); +} /** * @tc.name: IT_POSIX_QUEUE_147 diff --git a/testsuites/unittest/process/mutex/BUILD.gn b/testsuites/unittest/process/mutex/BUILD.gn index 1ba1fe28..169e2cae 100644 --- a/testsuites/unittest/process/mutex/BUILD.gn +++ b/testsuites/unittest/process/mutex/BUILD.gn @@ -59,7 +59,6 @@ sources_smoke = [ "smoke/pthread_mutex_test_015.cpp", "smoke/pthread_mutex_test_016.cpp", "smoke/pthread_mutex_test_017.cpp", - "smoke/pthread_mutex_test_018.cpp", "smoke/pthread_mutex_test_019.cpp", "smoke/pthread_mutex_test_020.cpp", "smoke/pthread_mutex_test_021.cpp", @@ -70,6 +69,7 @@ sources_smoke = [ ] sources_full = [ + "full/pthread_mutex_test_018.cpp", ] if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { diff --git a/testsuites/unittest/process/mutex/smoke/pthread_mutex_test_018.cpp b/testsuites/unittest/process/mutex/full/pthread_mutex_test_018.cpp similarity index 100% rename from testsuites/unittest/process/mutex/smoke/pthread_mutex_test_018.cpp rename to testsuites/unittest/process/mutex/full/pthread_mutex_test_018.cpp diff --git a/testsuites/unittest/process/mutex/process_mutex_test.cpp b/testsuites/unittest/process/mutex/process_mutex_test.cpp index 91b588f9..64ccbd56 100644 --- a/testsuites/unittest/process/mutex/process_mutex_test.cpp +++ b/testsuites/unittest/process/mutex/process_mutex_test.cpp @@ -238,17 +238,6 @@ HWTEST_F(ProcessMutexTest, ItTestPthreadMutex017, TestSize.Level0) } #ifndef LOSCFG_USER_TEST_SMP -/* * - * @tc.name: it_test_pthread_mutex_018 - * @tc.desc: function for ProcessMutexTest - * @tc.type: FUNC - * @tc.require: AR000EEMQ9 - */ -HWTEST_F(ProcessMutexTest, ItTestPthreadMutex018, TestSize.Level0) -{ - ItTestPthreadMutex018(); -} - /* * * @tc.name: it_test_pthread_mutex_019 * @tc.desc: function for ProcessMutexTest @@ -294,4 +283,19 @@ HWTEST_F(ProcessMutexTest, ItTestPthreadMutex022, TestSize.Level0) ItTestPthreadMutex022(); } #endif + +#if defined(LOSCFG_USER_TEST_FULL) +#ifndef LOSCFG_USER_TEST_SMP +/* * + * @tc.name: it_test_pthread_mutex_018 + * @tc.desc: function for ProcessMutexTest + * @tc.type: FUNC + * @tc.require: AR000EEMQ9 + */ +HWTEST_F(ProcessMutexTest, ItTestPthreadMutex018, TestSize.Level0) +{ + ItTestPthreadMutex018(); +} +#endif +#endif } // namespace OHOS -- GitLab