summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2015-07-09 18:01:35 +0200
committerMikael Magnusson <mikachu@gmail.com>2015-07-09 18:03:00 +0200
commit41888ae936cbf2a978cdf96f87804ef59861fc53 (patch)
tree8ca30ac7ae91d6ae1f257d5573c71b5f25c62287
parent3af55c858f12fe72eebd6addca89bf6395cae826 (diff)
downloadzsh-41888ae936cbf2a978cdf96f87804ef59861fc53.tar.gz
zsh-41888ae936cbf2a978cdf96f87804ef59861fc53.zip
unposted: Make V09 set a known timezone
-rw-r--r--ChangeLog3
-rw-r--r--Test/V09datetime.ztst7
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d646732ae..358c3e916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
* 35745: Src/utils.c, Test/V09datetime.ztst: ztrftime: Pass
everything unhandled to the system strftime()
+ * unposted: (c.f. Jun T: 35754): Test/V09datetime.ztst: Make
+ V09 set a known timezone
+
2015-07-09 Oliver Kiddle <opk@zsh.org>
* 35748: Completion/Zsh/Type/_ps1234,
diff --git a/Test/V09datetime.ztst b/Test/V09datetime.ztst
index c69e31ed5..a3b4e8c81 100644
--- a/Test/V09datetime.ztst
+++ b/Test/V09datetime.ztst
@@ -7,6 +7,7 @@
zmodload zsh/datetime
unset LC_ALL
LC_TIME=C
+ TZ=UTC+0
if [[ "$(strftime %04y 1)" = "0070" ]]; then
[[ "$(LC_TIME=ja_JP.UTF-8 strftime %OS 1)" = δΈ€ ]] || {
print -u $ZTST_fd "Not testing alternate date format extensions (missing ja_JP.UTF-8 locale)"
@@ -27,12 +28,12 @@
>70
>2001
>01/10/08
->22:20:01
+>21:20:01
- strftime %-m_%f_%K_%L 1181000000
+ strftime %-m_%f_%K_%L 1181100000
strftime %6. 0
0:zsh extensions
->6_5_1_1
+>6_6_3_3
>000000
[[ $skip_japanese = 1 ]] && repeat 5; do echo skipped; done || (