!388 fix mutex&pthread mould musl api:pthread_mutexattr_getrobust/pthread_mutexattr_setrobust/pthread_mutex_consistent/pthread_getconcurrency/pthread_setconcurrency
Merge pull request !388 from 王建军/mutex
This commit is contained in:
commit
9b24cc4915
|
@ -56,7 +56,6 @@ sources_smoke = [
|
||||||
"smoke/It_posix_pthread_020.cpp",
|
"smoke/It_posix_pthread_020.cpp",
|
||||||
"smoke/It_posix_pthread_021.cpp",
|
"smoke/It_posix_pthread_021.cpp",
|
||||||
"smoke/It_posix_pthread_022.cpp",
|
"smoke/It_posix_pthread_022.cpp",
|
||||||
"smoke/It_posix_pthread_203.cpp",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
sources_full = [
|
sources_full = [
|
||||||
|
@ -149,6 +148,7 @@ sources_full = [
|
||||||
"full/It_posix_pthread_193.cpp",
|
"full/It_posix_pthread_193.cpp",
|
||||||
"full/It_posix_pthread_194.cpp",
|
"full/It_posix_pthread_194.cpp",
|
||||||
"full/It_posix_pthread_200.cpp",
|
"full/It_posix_pthread_200.cpp",
|
||||||
|
"full/It_posix_pthread_203.cpp",
|
||||||
"full/It_posix_pthread_204.cpp",
|
"full/It_posix_pthread_204.cpp",
|
||||||
"full/It_posix_pthread_205.cpp",
|
"full/It_posix_pthread_205.cpp",
|
||||||
"full/It_posix_pthread_206.cpp",
|
"full/It_posix_pthread_206.cpp",
|
||||||
|
|
|
@ -253,7 +253,6 @@ VOID ItPosixPthread019(VOID);
|
||||||
VOID ItPosixPthread020(VOID);
|
VOID ItPosixPthread020(VOID);
|
||||||
VOID ItPosixPthread021(VOID);
|
VOID ItPosixPthread021(VOID);
|
||||||
VOID ItPosixPthread022(VOID);
|
VOID ItPosixPthread022(VOID);
|
||||||
VOID ItPosixPthread203(VOID);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(LOSCFG_USER_TEST_FULL)
|
#if defined(LOSCFG_USER_TEST_FULL)
|
||||||
|
@ -371,6 +370,7 @@ VOID ItPosixPthread194(VOID);
|
||||||
VOID IT_POSIX_PTHREAD_197(VOID);
|
VOID IT_POSIX_PTHREAD_197(VOID);
|
||||||
VOID IT_POSIX_PTHREAD_198(VOID);
|
VOID IT_POSIX_PTHREAD_198(VOID);
|
||||||
VOID ItPosixPthread200(VOID);
|
VOID ItPosixPthread200(VOID);
|
||||||
|
VOID ItPosixPthread203(VOID);
|
||||||
VOID ItPosixPthread204(VOID);
|
VOID ItPosixPthread204(VOID);
|
||||||
VOID ItPosixPthread205(VOID);
|
VOID ItPosixPthread205(VOID);
|
||||||
VOID ItPosixPthread206(VOID);
|
VOID ItPosixPthread206(VOID);
|
||||||
|
|
|
@ -327,17 +327,6 @@ HWTEST_F(PosixPthreadTest, ItPosixPthread022, TestSize.Level0)
|
||||||
ItPosixPthread022(); // pthread_cancel
|
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
|
#endif
|
||||||
|
|
||||||
#if defined(LOSCFG_USER_TEST_FULL)
|
#if defined(LOSCFG_USER_TEST_FULL)
|
||||||
|
@ -1267,6 +1256,17 @@ HWTEST_F(PosixPthreadTest, ItPosixPthread200, TestSize.Level0)
|
||||||
ItPosixPthread200();
|
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.name: IT_POSIX_PTHREAD_204
|
||||||
* @tc.desc: function for PosixPthreadTest
|
* @tc.desc: function for PosixPthreadTest
|
||||||
|
|
|
@ -63,13 +63,14 @@ sources_smoke = [
|
||||||
"smoke/pthread_mutex_test_020.cpp",
|
"smoke/pthread_mutex_test_020.cpp",
|
||||||
"smoke/pthread_mutex_test_021.cpp",
|
"smoke/pthread_mutex_test_021.cpp",
|
||||||
"smoke/pthread_mutex_test_022.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 = [
|
sources_full = [
|
||||||
"full/pthread_mutex_test_018.cpp",
|
"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) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
|
|
|
@ -297,5 +297,38 @@ HWTEST_F(ProcessMutexTest, ItTestPthreadMutex018, TestSize.Level0)
|
||||||
ItTestPthreadMutex018();
|
ItTestPthreadMutex018();
|
||||||
}
|
}
|
||||||
#endif
|
#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
|
#endif
|
||||||
} // namespace OHOS
|
} // namespace OHOS
|
||||||
|
|
Loading…
Reference in New Issue