Move icalendar test data to test/lisp/calendar/icalendar-resources

* test/lisp/calendar/icalendar-tests.el (ert-x): Required for
'ert-resource-file'.
(icalendar-tests--data-dir): Removed.
(icalendar-tests--get-file-contents): Use 'ert-resource-file' for
finding test data files.
* test/data/icalendar/*: Moved to test/lisp/calendar/icalendar-resources/.
* test/lisp/calendar/icalendar-resources/*: Moved from test/data/icalendar.

142 files changed, 3 insertions, 7 deletions

diff --git a/test/data/icalendar/import-bug-11473.diary-european b/test/lisp/calendar/icalendar-resources/import-bug-11473.diary-european
index 97348ae0498..97348ae0498 100644
--- a/test/data/icalendar/import-bug-11473.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-bug-11473.diary-european
diff --git a/test/data/icalendar/import-bug-11473.ics b/test/lisp/calendar/icalendar-resources/import-bug-11473.ics
index bc3a6c69fb7..bc3a6c69fb7 100644
--- a/test/data/icalendar/import-bug-11473.ics
+++ b/test/lisp/calendar/icalendar-resources/import-bug-11473.ics
diff --git a/test/data/icalendar/import-bug-22092.diary-american b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-american
index 392345fe0a2..392345fe0a2 100644
--- a/test/data/icalendar/import-bug-22092.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-american
diff --git a/test/data/icalendar/import-bug-22092.diary-european b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-european
index 6a64cf6a8e9..6a64cf6a8e9 100644
--- a/test/data/icalendar/import-bug-22092.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-european
diff --git a/test/data/icalendar/import-bug-22092.diary-iso b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-iso
index e0fadbf94dc..e0fadbf94dc 100644
--- a/test/data/icalendar/import-bug-22092.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-bug-22092.diary-iso
diff --git a/test/data/icalendar/import-bug-22092.ics b/test/lisp/calendar/icalendar-resources/import-bug-22092.ics
index 4a4c679da9c..4a4c679da9c 100644
--- a/test/data/icalendar/import-bug-22092.ics
+++ b/test/lisp/calendar/icalendar-resources/import-bug-22092.ics
diff --git a/test/data/icalendar/import-bug-24199.diary-american b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-american
index b3308f1fcfa..b3308f1fcfa 100644
--- a/test/data/icalendar/import-bug-24199.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-american
diff --git a/test/data/icalendar/import-bug-24199.diary-european b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-european
index acba714b527..acba714b527 100644
--- a/test/data/icalendar/import-bug-24199.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-european
diff --git a/test/data/icalendar/import-bug-24199.diary-iso b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-iso
index 2c18395dea8..2c18395dea8 100644
--- a/test/data/icalendar/import-bug-24199.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-bug-24199.diary-iso
diff --git a/test/data/icalendar/import-bug-24199.ics b/test/lisp/calendar/icalendar-resources/import-bug-24199.ics
index a307c2da3ca..a307c2da3ca 100644
--- a/test/data/icalendar/import-bug-24199.ics
+++ b/test/lisp/calendar/icalendar-resources/import-bug-24199.ics
diff --git a/test/data/icalendar/import-bug-33277.diary-american b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-american
index c546fa9a97c..c546fa9a97c 100644
--- a/test/data/icalendar/import-bug-33277.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-american
diff --git a/test/data/icalendar/import-bug-33277.diary-european b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-european
index 28e53960536..28e53960536 100644
--- a/test/data/icalendar/import-bug-33277.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-european
diff --git a/test/data/icalendar/import-bug-33277.diary-iso b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-iso
index faa7aeafeb5..faa7aeafeb5 100644
--- a/test/data/icalendar/import-bug-33277.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-bug-33277.diary-iso
diff --git a/test/data/icalendar/import-bug-33277.ics b/test/lisp/calendar/icalendar-resources/import-bug-33277.ics
index a4122a28007..a4122a28007 100644
--- a/test/data/icalendar/import-bug-33277.ics
+++ b/test/lisp/calendar/icalendar-resources/import-bug-33277.ics
diff --git a/test/data/icalendar/import-bug-6766.diary-american b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-american
index 30deea9911a..30deea9911a 100644
--- a/test/data/icalendar/import-bug-6766.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-american
diff --git a/test/data/icalendar/import-bug-6766.diary-european b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-european
index ba16c02305a..ba16c02305a 100644
--- a/test/data/icalendar/import-bug-6766.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-european
diff --git a/test/data/icalendar/import-bug-6766.diary-iso b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-iso
index 7794e586f37..7794e586f37 100644
--- a/test/data/icalendar/import-bug-6766.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-bug-6766.diary-iso
diff --git a/test/data/icalendar/import-bug-6766.ics b/test/lisp/calendar/icalendar-resources/import-bug-6766.ics
index 451391be025..451391be025 100644
--- a/test/data/icalendar/import-bug-6766.ics
+++ b/test/lisp/calendar/icalendar-resources/import-bug-6766.ics
diff --git a/test/data/icalendar/import-duration-2.diary-american b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-american
index 56f41d6ad9e..56f41d6ad9e 100644
--- a/test/data/icalendar/import-duration-2.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-american
diff --git a/test/data/icalendar/import-duration-2.diary-european b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-european
index 999102ab6b4..999102ab6b4 100644
--- a/test/data/icalendar/import-duration-2.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-european
diff --git a/test/data/icalendar/import-duration-2.diary-iso b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-iso
index 393937e6cd9..393937e6cd9 100644
--- a/test/data/icalendar/import-duration-2.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-duration-2.diary-iso
diff --git a/test/data/icalendar/import-duration-2.ics b/test/lisp/calendar/icalendar-resources/import-duration-2.ics
index eb8a03ba36f..eb8a03ba36f 100644
--- a/test/data/icalendar/import-duration-2.ics
+++ b/test/lisp/calendar/icalendar-resources/import-duration-2.ics
diff --git a/test/data/icalendar/import-duration.diary-american b/test/lisp/calendar/icalendar-resources/import-duration.diary-american
index 268736a8cd0..268736a8cd0 100644
--- a/test/data/icalendar/import-duration.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-duration.diary-american
diff --git a/test/data/icalendar/import-duration.diary-european b/test/lisp/calendar/icalendar-resources/import-duration.diary-european
index 7d852ddcd3c..7d852ddcd3c 100644
--- a/test/data/icalendar/import-duration.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-duration.diary-european
diff --git a/test/data/icalendar/import-duration.diary-iso b/test/lisp/calendar/icalendar-resources/import-duration.diary-iso
index 5d3a714284e..5d3a714284e 100644
--- a/test/data/icalendar/import-duration.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-duration.diary-iso
diff --git a/test/data/icalendar/import-duration.ics b/test/lisp/calendar/icalendar-resources/import-duration.ics
index 67f5c73571b..67f5c73571b 100644
--- a/test/data/icalendar/import-duration.ics
+++ b/test/lisp/calendar/icalendar-resources/import-duration.ics
diff --git a/test/data/icalendar/import-multiple-vcalendars.diary-american b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-american
index d1b1992a022..d1b1992a022 100644
--- a/test/data/icalendar/import-multiple-vcalendars.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-american
diff --git a/test/data/icalendar/import-multiple-vcalendars.diary-european b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-european
index f068354220c..f068354220c 100644
--- a/test/data/icalendar/import-multiple-vcalendars.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-european
diff --git a/test/data/icalendar/import-multiple-vcalendars.diary-iso b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-iso
index 5685e4708a7..5685e4708a7 100644
--- a/test/data/icalendar/import-multiple-vcalendars.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.diary-iso
diff --git a/test/data/icalendar/import-multiple-vcalendars.ics b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.ics
index 69a02c09b1b..69a02c09b1b 100644
--- a/test/data/icalendar/import-multiple-vcalendars.ics
+++ b/test/lisp/calendar/icalendar-resources/import-multiple-vcalendars.ics
diff --git a/test/data/icalendar/import-non-recurring-1.diary-american b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-american
index 780e3a8ce64..780e3a8ce64 100644
--- a/test/data/icalendar/import-non-recurring-1.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-american
diff --git a/test/data/icalendar/import-non-recurring-1.diary-european b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-european
index 7e0cd21b784..7e0cd21b784 100644
--- a/test/data/icalendar/import-non-recurring-1.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-european
diff --git a/test/data/icalendar/import-non-recurring-1.diary-iso b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-iso
index c7311286619..c7311286619 100644
--- a/test/data/icalendar/import-non-recurring-1.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-1.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.ics
index cd471efc861..cd471efc861 100644
--- a/test/data/icalendar/import-non-recurring-1.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-1.ics
diff --git a/test/data/icalendar/import-non-recurring-all-day.diary-american b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-american
index 1d4bb6a337e..1d4bb6a337e 100644
--- a/test/data/icalendar/import-non-recurring-all-day.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-american
diff --git a/test/data/icalendar/import-non-recurring-all-day.diary-european b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-european
index b56c7f4e17f..b56c7f4e17f 100644
--- a/test/data/icalendar/import-non-recurring-all-day.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-european
diff --git a/test/data/icalendar/import-non-recurring-all-day.diary-iso b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-iso
index f1c70ab34c3..f1c70ab34c3 100644
--- a/test/data/icalendar/import-non-recurring-all-day.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-all-day.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
index 4efa8ffa133..4efa8ffa133 100644
--- a/test/data/icalendar/import-non-recurring-all-day.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-all-day.ics
diff --git a/test/data/icalendar/import-non-recurring-another-example.diary-american b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-american
index 2eb8c0ab686..2eb8c0ab686 100644
--- a/test/data/icalendar/import-non-recurring-another-example.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-american
diff --git a/test/data/icalendar/import-non-recurring-another-example.diary-european b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-european
index 394eae8bb77..394eae8bb77 100644
--- a/test/data/icalendar/import-non-recurring-another-example.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-european
diff --git a/test/data/icalendar/import-non-recurring-another-example.diary-iso b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-iso
index 5e8bdf417d5..5e8bdf417d5 100644
--- a/test/data/icalendar/import-non-recurring-another-example.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-another-example.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.ics
index b145e418791..b145e418791 100644
--- a/test/data/icalendar/import-non-recurring-another-example.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-another-example.ics
diff --git a/test/data/icalendar/import-non-recurring-block.diary-american b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-american
index b22234229cf..b22234229cf 100644
--- a/test/data/icalendar/import-non-recurring-block.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-american
diff --git a/test/data/icalendar/import-non-recurring-block.diary-european b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-european
index 8043482442f..8043482442f 100644
--- a/test/data/icalendar/import-non-recurring-block.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-european
diff --git a/test/data/icalendar/import-non-recurring-block.diary-iso b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-iso
index e0f1896114f..e0f1896114f 100644
--- a/test/data/icalendar/import-non-recurring-block.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-block.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.ics
index 0c52ba3d66a..0c52ba3d66a 100644
--- a/test/data/icalendar/import-non-recurring-block.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-block.ics
diff --git a/test/data/icalendar/import-non-recurring-folded-summary.diary-american b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-american
index 2954d0c4fd1..2954d0c4fd1 100644
--- a/test/data/icalendar/import-non-recurring-folded-summary.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-american
diff --git a/test/data/icalendar/import-non-recurring-folded-summary.diary-european b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-european
index 7745fc811b4..7745fc811b4 100644
--- a/test/data/icalendar/import-non-recurring-folded-summary.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-european
diff --git a/test/data/icalendar/import-non-recurring-folded-summary.diary-iso b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-iso
index 8c19a95ed2d..8c19a95ed2d 100644
--- a/test/data/icalendar/import-non-recurring-folded-summary.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-folded-summary.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.ics
index e3ecee9dae8..e3ecee9dae8 100644
--- a/test/data/icalendar/import-non-recurring-folded-summary.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-folded-summary.ics
diff --git a/test/data/icalendar/import-non-recurring-long-summary.diary-american b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-american
index 84cd464c568..84cd464c568 100644
--- a/test/data/icalendar/import-non-recurring-long-summary.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-american
diff --git a/test/data/icalendar/import-non-recurring-long-summary.diary-european b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-european
index 5d6524202c3..5d6524202c3 100644
--- a/test/data/icalendar/import-non-recurring-long-summary.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-european
diff --git a/test/data/icalendar/import-non-recurring-long-summary.diary-iso b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-iso
index d2300522d9a..d2300522d9a 100644
--- a/test/data/icalendar/import-non-recurring-long-summary.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.diary-iso
diff --git a/test/data/icalendar/import-non-recurring-long-summary.ics b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.ics
index 39ae02f10ca..39ae02f10ca 100644
--- a/test/data/icalendar/import-non-recurring-long-summary.ics
+++ b/test/lisp/calendar/icalendar-resources/import-non-recurring-long-summary.ics
diff --git a/test/data/icalendar/import-real-world-2003-05-29.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-american
index e6c8712d254..e6c8712d254 100644
--- a/test/data/icalendar/import-real-world-2003-05-29.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-american
diff --git a/test/data/icalendar/import-real-world-2003-05-29.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-european
index cecca070a51..cecca070a51 100644
--- a/test/data/icalendar/import-real-world-2003-05-29.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.diary-european
diff --git a/test/data/icalendar/import-real-world-2003-05-29.ics b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.ics
index decc8df5451..decc8df5451 100644
--- a/test/data/icalendar/import-real-world-2003-05-29.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-05-29.ics
diff --git a/test/data/icalendar/import-real-world-2003-06-18a.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-american
index f2c914184e7..f2c914184e7 100644
--- a/test/data/icalendar/import-real-world-2003-06-18a.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-american
diff --git a/test/data/icalendar/import-real-world-2003-06-18a.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-european
index 89cff58af42..89cff58af42 100644
--- a/test/data/icalendar/import-real-world-2003-06-18a.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.diary-european
diff --git a/test/data/icalendar/import-real-world-2003-06-18a.ics b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.ics
index 6bb5b05af17..6bb5b05af17 100644
--- a/test/data/icalendar/import-real-world-2003-06-18a.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18a.ics
diff --git a/test/data/icalendar/import-real-world-2003-06-18b.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-american
index 2c0774cdd83..2c0774cdd83 100644
--- a/test/data/icalendar/import-real-world-2003-06-18b.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-american
diff --git a/test/data/icalendar/import-real-world-2003-06-18b.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-european
index 95aac168699..95aac168699 100644
--- a/test/data/icalendar/import-real-world-2003-06-18b.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.diary-european
diff --git a/test/data/icalendar/import-real-world-2003-06-18b.ics b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.ics
index 1523135adf3..1523135adf3 100644
--- a/test/data/icalendar/import-real-world-2003-06-18b.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2003-06-18b.ics
diff --git a/test/data/icalendar/import-real-world-2004-11-19.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-american
index a986f700ba2..a986f700ba2 100644
--- a/test/data/icalendar/import-real-world-2004-11-19.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-american
diff --git a/test/data/icalendar/import-real-world-2004-11-19.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-european
index cbfe99eb8e3..cbfe99eb8e3 100644
--- a/test/data/icalendar/import-real-world-2004-11-19.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.diary-european
diff --git a/test/data/icalendar/import-real-world-2004-11-19.ics b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.ics
index 9edb682fcad..9edb682fcad 100644
--- a/test/data/icalendar/import-real-world-2004-11-19.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2004-11-19.ics
diff --git a/test/data/icalendar/import-real-world-2005-02-07.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-american
index ce7d835d96b..ce7d835d96b 100644
--- a/test/data/icalendar/import-real-world-2005-02-07.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-american
diff --git a/test/data/icalendar/import-real-world-2005-02-07.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-european
index 3a52b0ab271..3a52b0ab271 100644
--- a/test/data/icalendar/import-real-world-2005-02-07.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.diary-european
diff --git a/test/data/icalendar/import-real-world-2005-02-07.ics b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.ics
index 9eec71fe751..9eec71fe751 100644
--- a/test/data/icalendar/import-real-world-2005-02-07.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2005-02-07.ics
diff --git a/test/data/icalendar/import-real-world-2005-03-01.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-american
index 23c93d45d9a..23c93d45d9a 100644
--- a/test/data/icalendar/import-real-world-2005-03-01.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-american
diff --git a/test/data/icalendar/import-real-world-2005-03-01.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-european
index 106e9f3cdd0..106e9f3cdd0 100644
--- a/test/data/icalendar/import-real-world-2005-03-01.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.diary-european
diff --git a/test/data/icalendar/import-real-world-2005-03-01.ics b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.ics
index ed9faa9b0bd..ed9faa9b0bd 100644
--- a/test/data/icalendar/import-real-world-2005-03-01.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-2005-03-01.ics
diff --git a/test/data/icalendar/import-real-world-no-dst.diary-american b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-american
index 290edb88760..290edb88760 100644
--- a/test/data/icalendar/import-real-world-no-dst.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-american
diff --git a/test/data/icalendar/import-real-world-no-dst.diary-european b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-european
index c56b7a6547a..c56b7a6547a 100644
--- a/test/data/icalendar/import-real-world-no-dst.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.diary-european
diff --git a/test/data/icalendar/import-real-world-no-dst.ics b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.ics
index 5f147af4f37..5f147af4f37 100644
--- a/test/data/icalendar/import-real-world-no-dst.ics
+++ b/test/lisp/calendar/icalendar-resources/import-real-world-no-dst.ics
diff --git a/test/data/icalendar/import-rrule-anniversary.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-american
index 7b86b554dd4..7b86b554dd4 100644
--- a/test/data/icalendar/import-rrule-anniversary.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-american
diff --git a/test/data/icalendar/import-rrule-anniversary.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-european
index 3b82ec09fd5..3b82ec09fd5 100644
--- a/test/data/icalendar/import-rrule-anniversary.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-european
diff --git a/test/data/icalendar/import-rrule-anniversary.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-iso
index 7fc99478d4e..7fc99478d4e 100644
--- a/test/data/icalendar/import-rrule-anniversary.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.diary-iso
diff --git a/test/data/icalendar/import-rrule-anniversary.ics b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
index 2996f494167..2996f494167 100644
--- a/test/data/icalendar/import-rrule-anniversary.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-anniversary.ics
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-american
index 84b6d109953..84b6d109953 100644
--- a/test/data/icalendar/import-rrule-count-bi-weekly.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-american
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-european
index 0bebdf8872f..0bebdf8872f 100644
--- a/test/data/icalendar/import-rrule-count-bi-weekly.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-european
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-iso
index 11429081abe..11429081abe 100644
--- a/test/data/icalendar/import-rrule-count-bi-weekly.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-bi-weekly.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.ics
index 888b85bb331..888b85bb331 100644
--- a/test/data/icalendar/import-rrule-count-bi-weekly.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-bi-weekly.ics
diff --git a/test/data/icalendar/import-rrule-count-daily-long.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-american
index 23fe9fcaf32..23fe9fcaf32 100644
--- a/test/data/icalendar/import-rrule-count-daily-long.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-american
diff --git a/test/data/icalendar/import-rrule-count-daily-long.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-european
index 0d4ab669058..0d4ab669058 100644
--- a/test/data/icalendar/import-rrule-count-daily-long.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-european
diff --git a/test/data/icalendar/import-rrule-count-daily-long.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-iso
index 8cecda5c879..8cecda5c879 100644
--- a/test/data/icalendar/import-rrule-count-daily-long.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-daily-long.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.ics
index 73df19a8196..73df19a8196 100644
--- a/test/data/icalendar/import-rrule-count-daily-long.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-long.ics
diff --git a/test/data/icalendar/import-rrule-count-daily-short.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-american
index d69bb08c318..d69bb08c318 100644
--- a/test/data/icalendar/import-rrule-count-daily-short.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-american
diff --git a/test/data/icalendar/import-rrule-count-daily-short.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-european
index 33a1ce4cf51..33a1ce4cf51 100644
--- a/test/data/icalendar/import-rrule-count-daily-short.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-european
diff --git a/test/data/icalendar/import-rrule-count-daily-short.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-iso
index a06bcba0dc1..a06bcba0dc1 100644
--- a/test/data/icalendar/import-rrule-count-daily-short.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-daily-short.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.ics
index 92ffe8be654..92ffe8be654 100644
--- a/test/data/icalendar/import-rrule-count-daily-short.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-daily-short.ics
diff --git a/test/data/icalendar/import-rrule-count-every-second-month.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-american
index 4ce8ef842f8..4ce8ef842f8 100644
--- a/test/data/icalendar/import-rrule-count-every-second-month.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-american
diff --git a/test/data/icalendar/import-rrule-count-every-second-month.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-european
index 09ec3756295..09ec3756295 100644
--- a/test/data/icalendar/import-rrule-count-every-second-month.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-european
diff --git a/test/data/icalendar/import-rrule-count-every-second-month.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-iso
index ae6feb70d4c..ae6feb70d4c 100644
--- a/test/data/icalendar/import-rrule-count-every-second-month.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-every-second-month.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.ics
index 3b27b665498..3b27b665498 100644
--- a/test/data/icalendar/import-rrule-count-every-second-month.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-month.ics
diff --git a/test/data/icalendar/import-rrule-count-every-second-year.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-american
index 99543aa9596..99543aa9596 100644
--- a/test/data/icalendar/import-rrule-count-every-second-year.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-american
diff --git a/test/data/icalendar/import-rrule-count-every-second-year.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-european
index 3b330886ce0..3b330886ce0 100644
--- a/test/data/icalendar/import-rrule-count-every-second-year.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-european
diff --git a/test/data/icalendar/import-rrule-count-every-second-year.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-iso
index 16af52ea91c..16af52ea91c 100644
--- a/test/data/icalendar/import-rrule-count-every-second-year.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-every-second-year.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.ics
index ce21c34d09a..ce21c34d09a 100644
--- a/test/data/icalendar/import-rrule-count-every-second-year.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-every-second-year.ics
diff --git a/test/data/icalendar/import-rrule-count-monthly.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-american
index ad5ca0b0ed4..ad5ca0b0ed4 100644
--- a/test/data/icalendar/import-rrule-count-monthly.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-american
diff --git a/test/data/icalendar/import-rrule-count-monthly.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-european
index 709de3a3fd5..709de3a3fd5 100644
--- a/test/data/icalendar/import-rrule-count-monthly.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-european
diff --git a/test/data/icalendar/import-rrule-count-monthly.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-iso
index 9fc2a2def94..9fc2a2def94 100644
--- a/test/data/icalendar/import-rrule-count-monthly.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-monthly.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.ics
index 3391ca24252..3391ca24252 100644
--- a/test/data/icalendar/import-rrule-count-monthly.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-monthly.ics
diff --git a/test/data/icalendar/import-rrule-count-yearly.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-american
index 8c1f95b0c05..8c1f95b0c05 100644
--- a/test/data/icalendar/import-rrule-count-yearly.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-american
diff --git a/test/data/icalendar/import-rrule-count-yearly.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-european
index e216e224eae..e216e224eae 100644
--- a/test/data/icalendar/import-rrule-count-yearly.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-european
diff --git a/test/data/icalendar/import-rrule-count-yearly.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-iso
index 3801192ee60..3801192ee60 100644
--- a/test/data/icalendar/import-rrule-count-yearly.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.diary-iso
diff --git a/test/data/icalendar/import-rrule-count-yearly.ics b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.ics
index d8569933e0c..d8569933e0c 100644
--- a/test/data/icalendar/import-rrule-count-yearly.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-count-yearly.ics
diff --git a/test/data/icalendar/import-rrule-daily-two-day.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-american
index 495fca5f8df..495fca5f8df 100644
--- a/test/data/icalendar/import-rrule-daily-two-day.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-american
diff --git a/test/data/icalendar/import-rrule-daily-two-day.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-european
index 61db14ab24a..61db14ab24a 100644
--- a/test/data/icalendar/import-rrule-daily-two-day.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-european
diff --git a/test/data/icalendar/import-rrule-daily-two-day.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-iso
index 0e0a4b19781..0e0a4b19781 100644
--- a/test/data/icalendar/import-rrule-daily-two-day.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.diary-iso
diff --git a/test/data/icalendar/import-rrule-daily-two-day.ics b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.ics
index 8c9cb3b2845..8c9cb3b2845 100644
--- a/test/data/icalendar/import-rrule-daily-two-day.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-two-day.ics
diff --git a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-american
index 83e5f582d5f..83e5f582d5f 100644
--- a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-american
diff --git a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-european
index a3c7fdd4177..a3c7fdd4177 100644
--- a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-european
diff --git a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-iso
index 88b4c892d16..88b4c892d16 100644
--- a/test/data/icalendar/import-rrule-daily-with-exceptions.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.diary-iso
diff --git a/test/data/icalendar/import-rrule-daily-with-exceptions.ics b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
index 5284bf42d8b..5284bf42d8b 100644
--- a/test/data/icalendar/import-rrule-daily-with-exceptions.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily-with-exceptions.ics
diff --git a/test/data/icalendar/import-rrule-daily.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-american
index 9213270fa41..9213270fa41 100644
--- a/test/data/icalendar/import-rrule-daily.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-american
diff --git a/test/data/icalendar/import-rrule-daily.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-european
index 2c70cd7da55..2c70cd7da55 100644
--- a/test/data/icalendar/import-rrule-daily.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-european
diff --git a/test/data/icalendar/import-rrule-daily.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-iso
index b201cb44308..b201cb44308 100644
--- a/test/data/icalendar/import-rrule-daily.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily.diary-iso
diff --git a/test/data/icalendar/import-rrule-daily.ics b/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
index 6d013b0b4f6..6d013b0b4f6 100644
--- a/test/data/icalendar/import-rrule-daily.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-daily.ics
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-american
index bc5453fe425..bc5453fe425 100644
--- a/test/data/icalendar/import-rrule-monthly-no-end.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-american
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-european
index f071519701d..f071519701d 100644
--- a/test/data/icalendar/import-rrule-monthly-no-end.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-european
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-iso
index 3709e933337..3709e933337 100644
--- a/test/data/icalendar/import-rrule-monthly-no-end.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.diary-iso
diff --git a/test/data/icalendar/import-rrule-monthly-no-end.ics b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
index b871658600a..b871658600a 100644
--- a/test/data/icalendar/import-rrule-monthly-no-end.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-no-end.ics
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-american
index 638ab8b2327..638ab8b2327 100644
--- a/test/data/icalendar/import-rrule-monthly-with-end.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-american
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-european
index c70cde25f32..c70cde25f32 100644
--- a/test/data/icalendar/import-rrule-monthly-with-end.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-european
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-iso
index ee51a2142a4..ee51a2142a4 100644
--- a/test/data/icalendar/import-rrule-monthly-with-end.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.diary-iso
diff --git a/test/data/icalendar/import-rrule-monthly-with-end.ics b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
index d8a1fe2e5af..d8a1fe2e5af 100644
--- a/test/data/icalendar/import-rrule-monthly-with-end.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-monthly-with-end.ics
diff --git a/test/data/icalendar/import-rrule-weekly.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-american
index d8bf2eba104..d8bf2eba104 100644
--- a/test/data/icalendar/import-rrule-weekly.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-american
diff --git a/test/data/icalendar/import-rrule-weekly.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-european
index e368fde9709..e368fde9709 100644
--- a/test/data/icalendar/import-rrule-weekly.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-european
diff --git a/test/data/icalendar/import-rrule-weekly.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-iso
index 49cd9d8ace6..49cd9d8ace6 100644
--- a/test/data/icalendar/import-rrule-weekly.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.diary-iso
diff --git a/test/data/icalendar/import-rrule-weekly.ics b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
index c3f0b8ae933..c3f0b8ae933 100644
--- a/test/data/icalendar/import-rrule-weekly.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-weekly.ics
diff --git a/test/data/icalendar/import-rrule-yearly.diary-american b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-american
index a54780b9699..a54780b9699 100644
--- a/test/data/icalendar/import-rrule-yearly.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-american
diff --git a/test/data/icalendar/import-rrule-yearly.diary-european b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-european
index a4bd81d6f2b..a4bd81d6f2b 100644
--- a/test/data/icalendar/import-rrule-yearly.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-european
diff --git a/test/data/icalendar/import-rrule-yearly.diary-iso b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-iso
index 65a7abe0344..65a7abe0344 100644
--- a/test/data/icalendar/import-rrule-yearly.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.diary-iso
diff --git a/test/data/icalendar/import-rrule-yearly.ics b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.ics
index 21cca097f7e..21cca097f7e 100644
--- a/test/data/icalendar/import-rrule-yearly.ics
+++ b/test/lisp/calendar/icalendar-resources/import-rrule-yearly.ics
diff --git a/test/data/icalendar/import-with-timezone.diary-iso b/test/lisp/calendar/icalendar-resources/import-with-timezone.diary-iso
index f99b59213e5..f99b59213e5 100644
--- a/test/data/icalendar/import-with-timezone.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-with-timezone.diary-iso
diff --git a/test/data/icalendar/import-with-timezone.ics b/test/lisp/calendar/icalendar-resources/import-with-timezone.ics
index 110a9835e41..110a9835e41 100644
--- a/test/data/icalendar/import-with-timezone.ics
+++ b/test/lisp/calendar/icalendar-resources/import-with-timezone.ics
diff --git a/test/data/icalendar/import-with-uid.diary-american b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-american
index 9b2f06afc26..9b2f06afc26 100644
--- a/test/data/icalendar/import-with-uid.diary-american
+++ b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-american
diff --git a/test/data/icalendar/import-with-uid.diary-european b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-european
index 95db4d40151..95db4d40151 100644
--- a/test/data/icalendar/import-with-uid.diary-european
+++ b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-european
diff --git a/test/data/icalendar/import-with-uid.diary-iso b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-iso
index d372e5a3d1f..d372e5a3d1f 100644
--- a/test/data/icalendar/import-with-uid.diary-iso
+++ b/test/lisp/calendar/icalendar-resources/import-with-uid.diary-iso
diff --git a/test/data/icalendar/import-with-uid.ics b/test/lisp/calendar/icalendar-resources/import-with-uid.ics
index db412d9d9f5..db412d9d9f5 100644
--- a/test/data/icalendar/import-with-uid.ics
+++ b/test/lisp/calendar/icalendar-resources/import-with-uid.ics
diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index 5143c78632a..8b44f639475 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -32,6 +32,7 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'icalendar)
 
 ;; ======================================================================
@@ -51,18 +52,13 @@
   (replace-regexp-in-string "[ \t\n]+\\'" ""
                             (replace-regexp-in-string "\\`[ \t\n]+" "" string)))
 
-(defconst icalendar-tests--data-dir
-  (expand-file-name "test/data/icalendar" source-directory))
-
 (defun icalendar-tests--get-file-contents (filename)
   "Return contents of file in test data directory named FILENAME."
   (with-temp-buffer
-    (let ((f1 (expand-file-name filename icalendar-tests--data-dir))
-          (f2 (expand-file-name filename "../../data/icalendar"))
-          (coding-system-for-read 'raw-text)
+    (let ((coding-system-for-read 'raw-text)
           (inhibit-eol-conversion t))
       (insert-file-contents-literally
-       (if (file-exists-p f1) f1 f2))
+       (ert-resource-file filename))
       (buffer-string))))
 
 ;; ======================================================================