Merge from gnulib.

[gnu-emacs] / test / automated / icalendar-tests.el

diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 85442b2019894cee3eec308423e88ceca4dacdd7..b921853c4aa06bf40a3a7f7dec281bcb703f868f 100644 (file)
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -1,6 +1,6 @@
 ;; icalendar-tests.el --- Test suite for icalendar.el
 
-;; Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        March 2005
@@ -433,9 +433,11 @@ and ISO style input data must use english month names."
        (icalendar-recurring-start-year 2000))
     (unwind-protect
        (progn
-         (message "Current time zone: %s" (current-time-zone))
-         (setenv "TZ" "CET")
-         (message "Current time zone: %s" (current-time-zone))
+;;;      (message "Current time zone: %s" (current-time-zone))
+         ;; Use this form so as not to rely on system tz database.
+         ;; Eg hydra.nixos.org.
+         (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
+;;;      (message "Current time zone: %s" (current-time-zone))
          (when input-iso
            (let ((calendar-month-name-array
                   ["January" "February" "March" "April" "May" "June" "July" "August"
@@ -676,9 +678,11 @@ Argument EXPECTED-AMERICAN expected american style diary string."
   (let ((timezone (getenv "TZ")))
     (unwind-protect
        (progn
-         (message "Current time zone: %s" (current-time-zone))
-         (setenv "TZ" "CET")
-         (message "Current time zone: %s" (current-time-zone))
+;;;      (message "Current time zone: %s" (current-time-zone))
+         ;; Use this form so as not to rely on system tz database.
+         ;; Eg hydra.nixos.org.
+         (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
+;;;      (message "Current time zone: %s" (current-time-zone))
          (with-temp-buffer
            (if (string-match "^BEGIN:VCALENDAR" input)
                (insert input)