xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:[TD-32642] add timezone support in windows

This commit is contained in:
wangmm0220 2024-12-03 22:28:18 +08:00
parent 074f39f4f6
commit f23633e83d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/CMakeLists.txt
View File

@ -665,7 +665,7 @@ MESSAGE(STATUS "timezone file path: " ${TZ_OUTPUT_PATH})
if(NOT ${TD_WINDOWS})
execute_process(
COMMAND make TZDIR=${TZ_OUTPUT_PATH}/ clean libtz.a
COMMAND make CFLAGS+=-fPIC TZDIR=${TZ_OUTPUT_PATH}/ clean libtz.a
WORKING_DIRECTORY "${TD_CONTRIB_DIR}/tz"
)

2
source/os/CMakeLists.txt
View File

@ -72,7 +72,7 @@ ENDIF ()
if(NOT ${TD_WINDOWS})
find_library(tz libtz.a "${TD_SOURCE_DIR}/contrib/tz")
target_link_libraries(os PUBLIC ${tz})
target_link_libraries(os PUBLIC ${tz})
endif(NOT ${TD_WINDOWS})
if(${BUILD_TEST})

10
source/os/test/osTimeTests.cpp
View File

@ -49,7 +49,7 @@ TEST(osTimeTests, taosLocalTime) {
// Test 4: Test when timep is negative on Windows
#ifdef WINDOWS
time_t pos_timep = 1609459200; // 2021-01-01 08:00:00
local_time = taosLocalTime(&pos_timep, &result, NULL, 0);
local_time = taosLocalTime(&pos_timep, &result, NULL, 0, NULL);
ASSERT_NE(local_time, nullptr);
ASSERT_EQ(local_time->tm_year, 121);
ASSERT_EQ(local_time->tm_mon, 0);
@ -59,7 +59,7 @@ TEST(osTimeTests, taosLocalTime) {
ASSERT_EQ(local_time->tm_sec, 0);
time_t neg_timep = -1617531000; // 1918-09-29 21:50:00
local_time = taosLocalTime(&neg_timep, &result, NULL, 0);
local_time = taosLocalTime(&neg_timep, &result, NULL, 0, NULL);
ASSERT_NE(local_time, nullptr);
ASSERT_EQ(local_time->tm_year, 18);
ASSERT_EQ(local_time->tm_mon, 8);
@ -69,7 +69,7 @@ TEST(osTimeTests, taosLocalTime) {
ASSERT_EQ(local_time->tm_sec, 0);
time_t neg_timep2 = -315619200; // 1960-01-01 08:00:00
local_time = taosLocalTime(&neg_timep2, &result, NULL, 0);
local_time = taosLocalTime(&neg_timep2, &result, NULL, 0, NULL);
ASSERT_NE(local_time, nullptr);
ASSERT_EQ(local_time->tm_year, 60);
ASSERT_EQ(local_time->tm_mon, 0);
@ -79,7 +79,7 @@ TEST(osTimeTests, taosLocalTime) {
ASSERT_EQ(local_time->tm_sec, 0);
time_t zero_timep = 0; // 1970-01-01 08:00:00
local_time = taosLocalTime(&zero_timep, &result, NULL, 0);
local_time = taosLocalTime(&zero_timep, &result, NULL, 0, NULL);
ASSERT_NE(local_time, nullptr);
ASSERT_EQ(local_time->tm_year, 70);
ASSERT_EQ(local_time->tm_mon, 0);
@ -89,7 +89,7 @@ TEST(osTimeTests, taosLocalTime) {
ASSERT_EQ(local_time->tm_sec, 0);
time_t neg_timep3 = -78115158887;
local_time = taosLocalTime(&neg_timep3, &result, NULL, 0);
local_time = taosLocalTime(&neg_timep3, &result, NULL, 0, NULL);
ASSERT_EQ(local_time, nullptr);
#endif
}