From 3c34e4cdfd5be769c6835ca2cfe87d8a36b3bb25 Mon Sep 17 00:00:00 2001 From: Filip Filmar Date: Tue, 20 Oct 2020 17:50:39 +0000 Subject: [PATCH] [fuchsia] Updates tzdata revision and path A cosmetic change that brings the Chromium tests closer to what is being used in production in Fuchsia today. - Brings the unit test paths in sync with the correct path in Fuchsia: https://cs.opensource.google/fuchsia/fuchsia/+/master:src/lib/icu/tzdata/icu_tzdata_config_data.gni;l=11 - The loader code in icu_util.cc has been changed before to use the correct path, so no changes are required there. - The content of the tzdata directory is adjusted to match the contents that are provided by Fuchsia. This includes the newly introduced file revision.txt, which contains an assertion about what revision of tzdata is supposed to be packaged. Bug: 1139410 Change-Id: I80707a3daa0e492d747e9542b64593bf41a545c6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2480891 Reviewed-by: David Dorwin Reviewed-by: Wez Commit-Queue: Filip Filmar Cr-Commit-Position: refs/heads/master@{#818994} --- base/fuchsia/time_zone_data_unittest.cc | 2 +- .../data/tzdata/{2019a => icu}/44/le/metaZones.res | Bin .../tzdata/{2019a => icu}/44/le/timezoneTypes.res | Bin .../data/tzdata/{2019a => icu}/44/le/zoneinfo64.res | Bin base/test/data/tzdata/revision.txt | 1 + 5 files changed, 2 insertions(+), 1 deletion(-) rename base/test/data/tzdata/{2019a => icu}/44/le/metaZones.res (100%) rename base/test/data/tzdata/{2019a => icu}/44/le/timezoneTypes.res (100%) rename base/test/data/tzdata/{2019a => icu}/44/le/zoneinfo64.res (100%) create mode 100644 base/test/data/tzdata/revision.txt diff --git a/base/fuchsia/time_zone_data_unittest.cc b/base/fuchsia/time_zone_data_unittest.cc index d90ac387dcfc99..3256b511d22fe7 100644 --- a/base/fuchsia/time_zone_data_unittest.cc +++ b/base/fuchsia/time_zone_data_unittest.cc @@ -18,7 +18,7 @@ namespace i18n { namespace { // Directory path to the tzdata configuration files. -const char kTzDataDirPath[] = "/pkg/base/test/data/tzdata/2019a/44/le"; +const char kTzDataDirPath[] = "/pkg/base/test/data/tzdata/icu/44/le"; // File path to the text file containing the expected ICU library revision, for // example "2019c". diff --git a/base/test/data/tzdata/2019a/44/le/metaZones.res b/base/test/data/tzdata/icu/44/le/metaZones.res similarity index 100% rename from base/test/data/tzdata/2019a/44/le/metaZones.res rename to base/test/data/tzdata/icu/44/le/metaZones.res diff --git a/base/test/data/tzdata/2019a/44/le/timezoneTypes.res b/base/test/data/tzdata/icu/44/le/timezoneTypes.res similarity index 100% rename from base/test/data/tzdata/2019a/44/le/timezoneTypes.res rename to base/test/data/tzdata/icu/44/le/timezoneTypes.res diff --git a/base/test/data/tzdata/2019a/44/le/zoneinfo64.res b/base/test/data/tzdata/icu/44/le/zoneinfo64.res similarity index 100% rename from base/test/data/tzdata/2019a/44/le/zoneinfo64.res rename to base/test/data/tzdata/icu/44/le/zoneinfo64.res diff --git a/base/test/data/tzdata/revision.txt b/base/test/data/tzdata/revision.txt new file mode 100644 index 00000000000000..149d790c3d12ee --- /dev/null +++ b/base/test/data/tzdata/revision.txt @@ -0,0 +1 @@ +2019a