summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2019-08-02 14:59:38 +0200
committerAndy Wingo <wingo@pobox.com>2019-08-02 14:59:38 +0200
commit558dfa45685bb2418ed5ee871fefe2dd1d88692f (patch)
tree9e7f078cd4822cd155401f81e84583d92236c380
parentdbb2b1d4373fc88b32dad55a41889d9f0136cb28 (diff)
parent75f3ba77596851724079670775e6c3ba3daf5929 (diff)
downloadguile-558dfa45685bb2418ed5ee871fefe2dd1d88692f.tar.gz
Merge from stable-2.2
-rw-r--r--test-suite/tests/time.test36
1 files changed, 20 insertions, 16 deletions
diff --git a/test-suite/tests/time.test b/test-suite/tests/time.test
index da7a48c04..2c829abfe 100644
--- a/test-suite/tests/time.test
+++ b/test-suite/tests/time.test
@@ -195,37 +195,41 @@
(with-test-prefix "strftime"
- (pass-if "strftime %Z doesn't return garbage"
+ (pass-if-equal "strftime %Z doesn't return garbage"
+ "ZOW"
(let ((t (localtime (current-time))))
(set-tm:zone t "ZOW")
(set-tm:isdst t 0)
- (string=? (strftime "%Z" t)
- "ZOW")))
+ (strftime "%Z" t)))
- (pass-if "strftime passes wide characters"
+ (pass-if-equal "strftime passes wide characters"
+ "\u0100"
(let ((t (localtime (current-time))))
- (string=? (substring (strftime "\u0100%Z" t) 0 1)
- "\u0100")))
+ (substring (strftime "\u0100%Z" t) 0 1)))
(with-test-prefix "C99 %z format"
;; %z here is quite possibly affected by the same tm:gmtoff vs current
;; zone as %Z above is, so in the following tests we make them the same.
- (pass-if "GMT"
- (putenv "TZ=GMT+0")
- (tzset)
- (let ((tm (localtime 86400)))
- (string=? "+0000" (strftime "%z" tm))))
+ (pass-if-equal "GMT"
+ "+0000"
+ (begin
+ (putenv "TZ=GMT+0")
+ (tzset)
+ (let ((tm (localtime 86400)))
+ (strftime "%z" tm))))
;; prior to guile 1.6.9 and 1.8.1 this test failed, getting "+0500",
;; because we didn't adjust for tm:gmtoff being west of Greenwich versus
;; tm_gmtoff being east of Greenwich
- (pass-if "EST+5"
- (putenv "TZ=EST+5")
- (tzset)
- (let ((tm (localtime 86400)))
- (string=? "-0500" (strftime "%z" tm))))))
+ (pass-if-equal "EST+5"
+ "-0500"
+ (begin
+ (putenv "TZ=EST+5")
+ (tzset)
+ (let ((tm (localtime 86400)))
+ (strftime "%z" tm))))))
;;;
;;; strptime