From 39a934b5e96e1c20f642775b285980faefe5027f Mon Sep 17 00:00:00 2001 From: Adam Burgess Date: Wed, 26 Aug 2020 05:14:17 +1000 Subject: [PATCH] Fix setting TZ on Windows --- test/chrono-test.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/chrono-test.cc b/test/chrono-test.cc index a7065f76..34c55689 100644 --- a/test/chrono-test.cc +++ b/test/chrono-test.cc @@ -95,8 +95,14 @@ TEST(TimeTest, GMTime) { EXPECT_TRUE(EqualTime(tm, fmt::gmtime(t))); } +#ifdef WIN32 +# define ENV(key, val) _putenv_s(key, val) +#else +# define ENV(key, val) setenv(key, val, 1) +#endif + TEST(TimeTest, TimePoint) { - setenv("TZ", "EST+5", 1); + ENV("TZ", "EST+5"); tzset(); std::chrono::system_clock::time_point point(std::chrono::seconds(1598412345)); EXPECT_EQ("It is 2020-08-25 22:25:45.", @@ -104,7 +110,7 @@ TEST(TimeTest, TimePoint) { } TEST(TimeTest, LocalTimeWithTimePoint) { - setenv("TZ", "EST+5", 1); + ENV("TZ", "EST+5"); tzset(); std::chrono::system_clock::time_point point(std::chrono::seconds(1598412345)); EXPECT_EQ("It is 2020-08-25 22:25:45.",