about summary refs log tree commit diff
path: root/Test/V09datetime.ztst
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-11-21 23:56:25 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2015-11-21 23:56:25 -0800
commitb1688305cc83e63104d4c581f649bbdcffa0e3b8 (patch)
treecb398b147c03d54bb79e071d810acde5c81b501f /Test/V09datetime.ztst
parentcce4261a3c6f4bf78b483db61623c80e3c98d10b (diff)
downloadzsh-b1688305cc83e63104d4c581f649bbdcffa0e3b8.tar.gz
zsh-b1688305cc83e63104d4c581f649bbdcffa0e3b8.tar.xz
zsh-b1688305cc83e63104d4c581f649bbdcffa0e3b8.zip
37181: consistent use of zmodload and corresponding ZTST_unimplemented or ZTST_skip
Diffstat (limited to 'Test/V09datetime.ztst')
-rw-r--r--Test/V09datetime.ztst22
1 files changed, 11 insertions, 11 deletions
diff --git a/Test/V09datetime.ztst b/Test/V09datetime.ztst
index 1e677cd69..63ff4ee23 100644
--- a/Test/V09datetime.ztst
+++ b/Test/V09datetime.ztst
@@ -1,18 +1,18 @@
 %prep
 
-  if ! (zmodload zsh/datetime >/dev/null 2>/dev/null); then
+  if zmodload zsh/datetime 2>/dev/null; then
+    setopt multibyte
+    unset LC_ALL
+    LC_TIME=C
+    TZ=UTC+0
+    # It's not clear this skip_extensions is correct, but the
+    # format in question is causing problems on Solaris.
+    # We'll revist this after the release.
+    [[ "$(strftime %^_10B 0)" = "   JANUARY" ]] || skip_extensions=1
+    [[ "$(LC_TIME=ja_JP.UTF-8 strftime %OS 1)" = 一 ]] || skip_japanese=1
+  else
     ZTST_unimplemented="can't load the zsh/datetime module for testing"
   fi
-  setopt multibyte
-  zmodload zsh/datetime
-  unset LC_ALL
-  LC_TIME=C
-  TZ=UTC+0
-  # It's not clear this skip_extensions is correct, but the
-  # format in question is causing problems on Solaris.
-  # We'll revist this after the release.
-  [[ "$(strftime %^_10B 0)" = "   JANUARY" ]] || skip_extensions=1
-  [[ "$(LC_TIME=ja_JP.UTF-8 strftime %OS 1)" = 一 ]] || skip_japanese=1
 
 %test