* lisp/emacs-lisp/package.el (package-unpack): Load before compiling

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

diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el
index 68d0a400137e06b1224106cb7918bdee744b9b4c..7e05d49883ea669359e3f9bdee79ab9d4993b928 100644 (file)
--- a/test/automated/icalendar-tests.el
+++ b/test/automated/icalendar-tests.el
@@ -213,7 +213,7 @@ END:VTIMEZONE
     (should (string= "STD-02:00DST-03:00,M3.5.0/03:00:00,M10.5.0/04:00:00"
                      (cdr result)))
     (setq vtimezone (icalendar-tests--get-ical-event "BEGIN:VTIMEZONE
-TZID:anothername\, with a comma
+TZID:anothername, with a comma
 BEGIN:STANDARD
 DTSTART:16010101T040000
 TZOFFSETFROM:+0300
@@ -235,7 +235,7 @@ END:VTIMEZONE
                      (cdr result)))
     ;; offsetfrom = offsetto
     (setq vtimezone (icalendar-tests--get-ical-event "BEGIN:VTIMEZONE
-TZID:Kolkata\, Chennai\, Mumbai\, New Delhi
+TZID:Kolkata, Chennai, Mumbai, New Delhi
 X-MICROSOFT-CDO-TZID:23
 BEGIN:STANDARD
 DTSTART:16010101T000000
@@ -391,8 +391,8 @@ END:VTIMEZONE
 
 (ert-deftest icalendar--import-format-sample ()
   "Test method for `icalendar-import-format-sample'."
-  (should (string= (concat "SUMMARY=`a' DESCRIPTION=`b' LOCATION=`c' "
-                           "ORGANIZER=`d' STATUS=`' URL=`' CLASS=`'")
+  (should (string= (concat "SUMMARY='a' DESCRIPTION='b' LOCATION='c' "
+                           "ORGANIZER='d' STATUS='' URL='' CLASS=''")
                   (icalendar-import-format-sample
                     (icalendar-tests--get-ical-event "BEGIN:VEVENT
 DTSTAMP:20030509T043439Z
@@ -1318,11 +1318,16 @@ DTEND;VALUE=DATE-TIME:20030919T113000"
    "&9/19/2003 09:00-11:30 non-recurring\n UID: 1234567890uid\n"))
 
 (ert-deftest icalendar-import-with-timezone ()
+  ;; This is known to fail on MS-Windows, because the test assumes
+  ;; Posix features of specifying DST rules.
+  :expected-result (if (memq system-type '(windows-nt ms-dos))
+                       :failed
+                     :passed)
   ;; bug#11473
   (icalendar-tests--test-import
    "BEGIN:VCALENDAR
 BEGIN:VTIMEZONE
-TZID:fictional\, nonexistent\, arbitrary
+TZID:fictional, nonexistent, arbitrary
 BEGIN:STANDARD
 DTSTART:20100101T000000
 TZOFFSETFROM:+0200
@@ -1446,6 +1451,11 @@ SUMMARY:and diary-anniversary
 ;; ======================================================================
 (ert-deftest icalendar-real-world ()
   "Perform real-world tests, as gathered from problem reports."
+  ;; This is known to fail on MS-Windows, since it doesn't support DST
+  ;; specification with month and day.
+  :expected-result (if (memq system-type '(windows-nt ms-dos))
+                       :failed
+                     :passed)
   ;; 2003-05-29
   (icalendar-tests--test-import
    "BEGIN:VCALENDAR
@@ -1453,7 +1463,7 @@ METHOD:REQUEST
 PRODID:Microsoft CDO for Microsoft Exchange
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:Kolkata\, Chennai\, Mumbai\, New Delhi
+TZID:Kolkata, Chennai, Mumbai, New Delhi
 X-MICROSOFT-CDO-TZID:23
 BEGIN:STANDARD
 DTSTART:16010101T000000
@@ -2164,7 +2174,7 @@ METHOD:REQUEST
 PRODID:Microsoft Exchange Server 2007
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:(UTC+01:00) Amsterdam\, Berlin\, Bern\, Rome\, Stockholm\, Vienna
+TZID:(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna
 BEGIN:STANDARD
 DTSTART:16010101T030000
 TZOFFSETFROM:+0200