summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Test/V09datetime.ztst13
2 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c150dc9f..1a24fe10b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-10 Mikael Magnusson <mikachu@gmail.com>
+
+ * 35761: Test/V09datetime.ztst: Make sure to skip alternate
+ format extension test properly
+
2015-07-10 Peter Stephenson <p.stephenson@samsung.com>
* unpsoted: another ZTST_skip.
diff --git a/Test/V09datetime.ztst b/Test/V09datetime.ztst
index a7ef9837c..5c6605587 100644
--- a/Test/V09datetime.ztst
+++ b/Test/V09datetime.ztst
@@ -8,13 +8,8 @@
unset LC_ALL
LC_TIME=C
TZ=UTC+0
- if [[ "$(strftime %04y 1)" = "0070" ]]; then
- [[ "$(LC_TIME=ja_JP.UTF-8 strftime %OS 1)" = 一 ]] || {
- skip_japanese=1
- }
- else
- skip_extensions=1
- fi
+ [[ "$(strftime %04y 1)" = "0070" ]] || skip_extensions=1
+ [[ "$(LC_TIME=ja_JP.UTF-8 strftime %OS 1)" = 一 ]] || skip_japanese=1
%test
@@ -34,7 +29,9 @@
>6_6_3_3
>000000
- if [[ $skip_japanese = 1 ]]; then
+ if [[ $skip_extensions = 1 ]]; then
+ ZTST_skip="strftime extensions not supported"
+ elif [[ $skip_japanese = 1 ]]; then
ZTST_skip="Japanese UTF-8 locale not supported"
else
(