yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!334 fix: 修改tzset测试用例运行2遍现象 

Merge pull request !334 from guweijie/master
This commit is contained in:
openharmony_ci 2021-06-22 06:29:34 +00:00 committed by Gitee
parent 8bb4538de1 e4b6ba56b9
commit b7f2df0350
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testsuites/unittest/time/timer/smoke/timer_test_tzset_001.cpp
View File

@ -36,7 +36,7 @@
#include "lt_timer_test.h" #include "lt_timer_test.h"
#include <stdlib.h> #include <stdlib.h>
static UINT32 testcase1(VOID) static UINT32 testcase(VOID)
{ {
time_t td; time_t td;
int ret = 0; int ret = 0;
@ -58,11 +58,6 @@ OUT:
return LOS_NOK; return LOS_NOK;
} }
static UINT32 testcase(VOID)
{
testcase1();
}
void TIME_TEST_TZSET_001(void) void TIME_TEST_TZSET_001(void)
{ {
TEST_ADD_CASE(__FUNCTION__, testcase, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION); TEST_ADD_CASE(__FUNCTION__, testcase, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION);

9
testsuites/unittest/time/timer/smoke/timer_test_tzset_002.cpp
View File

@ -36,13 +36,13 @@
#include "lt_timer_test.h" #include "lt_timer_test.h"
#include <stdlib.h> #include <stdlib.h>
static UINT32 testcase1(VOID) static UINT32 testcase(VOID)
{ {
time_t td; time_t td;
int ret = 0; int ret = 0;
errno = 0; errno = 0;
ret = putenv("TZ=GMT-100"); ret = putenv((char *) "TZ=GMT-100");
ICUNIT_ASSERT_EQUAL(ret, 0, ret); ICUNIT_ASSERT_EQUAL(ret, 0, ret);
tzset(); tzset();
@ -58,11 +58,6 @@ OUT:
return LOS_NOK; return LOS_NOK;
} }
static UINT32 testcase(VOID)
{
testcase1();
}
void TIME_TEST_TZSET_002(void) void TIME_TEST_TZSET_002(void)
{ {
TEST_ADD_CASE(__FUNCTION__, testcase, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION); TEST_ADD_CASE(__FUNCTION__, testcase, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION);

22
testsuites/unittest/time/timer/time_timer_test.cpp
View File

@ -97,5 +97,27 @@ HWTEST_F(TimeTimerTest, TimerTest005, TestSize.Level0)
{ {
TimerTest005(); TimerTest005();
} }
/* *
* @tc.name: TIME_TEST_TZSET_001
* @tc.desc: function for TIME_TEST_TZSET_001
* @tc.type: FUNC
* @tc.require: AR000EEMQ9
*/
HWTEST_F(TimeTimerTest, TIME_TEST_TZSET_001, TestSize.Level0)
{
TIME_TEST_TZSET_001();
}
/* *
* @tc.name: TIME_TEST_TZSET_002
* @tc.desc: function for TimeTimerTest
* @tc.type: FUNC
* @tc.require: AR000EEMQ9
*/
HWTEST_F(TimeTimerTest, TIME_TEST_TZSET_002, TestSize.Level0)
{
TIME_TEST_TZSET_002();
}
#endif #endif
} // namespace OHOS } // namespace OHOS