aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris2013-08-03 19:30:11 -0700
committerGlenn Morris2013-08-03 19:30:11 -0700
commit2ad0a067728ccc7f8b32b0c3db1677ca351943fe (patch)
tree3ecd94d1684ba1debf326f1c76008c0ab727e6b9 /test
parent36bec1b6eb1291de6d92ce52439f47384fa5970f (diff)
downloademacs-2ad0a067728ccc7f8b32b0c3db1677ca351943fe.tar.gz
emacs-2ad0a067728ccc7f8b32b0c3db1677ca351943fe.zip
* test/automated/icalendar-tests.el (icalendar-tests--test-export)
(icalendar-tests--test-import): Try more precise TZ specification.
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/icalendar-tests.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 7407f1fe725..f3d14786bd9 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12013-08-04 Glenn Morris <rgm@gnu.org>
2
3 * automated/icalendar-tests.el (icalendar-tests--test-export)
4 (icalendar-tests--test-import): Try more precise TZ specification.
5
12013-08-03 Glenn Morris <rgm@gnu.org> 62013-08-03 Glenn Morris <rgm@gnu.org>
2 7
3 * automated/core-elisp-tests.el (core-elisp-tests): Fix defcustom. 8 * automated/core-elisp-tests.el (core-elisp-tests): Fix defcustom.
diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 85442b20198..227855681e8 100644
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -434,7 +434,7 @@ and ISO style input data must use english month names."
434 (unwind-protect 434 (unwind-protect
435 (progn 435 (progn
436 (message "Current time zone: %s" (current-time-zone)) 436 (message "Current time zone: %s" (current-time-zone))
437 (setenv "TZ" "CET") 437 (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
438 (message "Current time zone: %s" (current-time-zone)) 438 (message "Current time zone: %s" (current-time-zone))
439 (when input-iso 439 (when input-iso
440 (let ((calendar-month-name-array 440 (let ((calendar-month-name-array
@@ -677,7 +677,7 @@ Argument EXPECTED-AMERICAN expected american style diary string."
677 (unwind-protect 677 (unwind-protect
678 (progn 678 (progn
679 (message "Current time zone: %s" (current-time-zone)) 679 (message "Current time zone: %s" (current-time-zone))
680 (setenv "TZ" "CET") 680 (setenv "TZ" "CET-1CEST,M3.5.0/2,M10.5.0/3")
681 (message "Current time zone: %s" (current-time-zone)) 681 (message "Current time zone: %s" (current-time-zone))
682 (with-temp-buffer 682 (with-temp-buffer
683 (if (string-match "^BEGIN:VCALENDAR" input) 683 (if (string-match "^BEGIN:VCALENDAR" input)