diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-11-12 17:52:35 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-13 12:30:22 +0100 |
| commit | 437f48a471f51ac9dd2697ee3b848a71b4f101df (patch) | |
| tree | f05a4944d2069c33b52618eea544f9b799414730 /src/test | |
| parent | d5fc5b2f8d62ba2a79eb755272e67ff3f117c5c5 (diff) | |
| download | systemd-437f48a471f51ac9dd2697ee3b848a71b4f101df.tar.gz | |
tree-wide: fix how we set $TZ
According to tzset(3) we need to prefix timezone names with ":". Let's
do so hence, to avoid any ambiguities and follow documented behaviour.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-calendarspec.c | 9 | ||||
| -rw-r--r-- | src/test/test-time-util.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index 899e4b5d27..9c2be7f445 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -43,9 +43,12 @@ static void test_next(const char *input, const char *new_tz, usec_t after, usec_ if (old_tz) old_tz = strdupa(old_tz); - if (new_tz) - assert_se(setenv("TZ", new_tz, 1) >= 0); - else + if (new_tz) { + char *colon_tz; + + colon_tz = strjoina(":", new_tz); + assert_se(setenv("TZ", colon_tz, 1) >= 0); + } else assert_se(unsetenv("TZ") >= 0); tzset(); diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c index d05bb61429..a422cc8ddc 100644 --- a/src/test/test-time-util.c +++ b/src/test/test-time-util.c @@ -475,7 +475,7 @@ static void test_in_utc_timezone(void) { assert_se(timezone == 0); assert_se(daylight == 0); - assert_se(setenv("TZ", "Europe/Berlin", 1) >= 0); + assert_se(setenv("TZ", ":Europe/Berlin", 1) >= 0); assert_se(!in_utc_timezone()); assert_se(streq(tzname[0], "CET")); assert_se(streq(tzname[1], "CEST")); |