Skip to content

Commit 8835921

Browse files
committed
[libc++][chrono] TZDB CI fixes.
Fixes a conflict with adding the no experimental module build. Disables some tests that need further investigation, this should fix the CI runners. These issues were reported on Discord and in D154282.
1 parent ab0eb59 commit 8835921

File tree

7 files changed

+25
-5
lines changed

7 files changed

+25
-5
lines changed

libcxx/modules/std/chrono.inc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ export namespace std {
193193
#if !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) && \
194194
!defined(_LIBCPP_HAS_NO_LOCALIZATION)
195195

196+
# ifdef _LIBCPP_ENABLE_EXPERIMENTAL
196197
// [time.zone.db], time zone database
197198
using std::chrono::tzdb;
198199
using std::chrono::tzdb_list;
@@ -207,10 +208,10 @@ export namespace std {
207208
using std::chrono::reload_tzdb;
208209
using std::chrono::remote_version;
209210

210-
#endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) &&
211-
// !defined(_LIBCPP_HAS_NO_LOCALIZATION)
211+
# endif // !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM) &&
212+
// !defined(_LIBCPP_HAS_NO_LOCALIZATION)
212213

213-
#if 0
214+
# if 0
214215
// [time.zone.exception], exception classes
215216
using std::chrono::ambiguous_local_time;
216217
using std::chrono::nonexistent_local_time;
@@ -238,8 +239,9 @@ export namespace std {
238239

239240
// [time.format], formatting
240241
using std::chrono::local_time_format;
241-
#endif
242-
} // namespace chrono
242+
# endif
243+
#endif // _LIBCPP_ENABLE_EXPERIMENTAL
244+
} // namespace chrono
243245

244246
#ifndef _LIBCPP_HAS_NO_LOCALIZATION
245247
using std::formatter;

libcxx/test/std/time/time.zone/time.zone.db/time.zone.db.access/get_tzdb.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// XFAIL: libcpp-has-no-incomplete-tzdb
1313
// XFAIL: availability-tzdb-missing
1414

15+
// TODO TZDB Enable tests
16+
// UNSUPPORTED: c++20, c++23, c++26
17+
1518
// <chrono>
1619

1720
// const tzdb& get_tzdb();

libcxx/test/std/time/time.zone/time.zone.db/time.zone.db.access/get_tzdb_list.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// XFAIL: libcpp-has-no-incomplete-tzdb
1313
// XFAIL: availability-tzdb-missing
1414

15+
// TODO TZDB Enable tests
16+
// UNSUPPORTED: c++20, c++23, c++26
17+
1518
// <chrono>
1619

1720
// const tzdb& get_tzdb_list();

libcxx/test/std/time/time.zone/time.zone.db/time.zone.db.list/front.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// XFAIL: libcpp-has-no-incomplete-tzdb
1313
// XFAIL: availability-tzdb-missing
1414

15+
// TODO TZDB Enable tests
16+
// UNSUPPORTED: c++20, c++23, c++26
17+
1518
// <chrono>
1619
//
1720
// class tzdb_list;

libcxx/test/std/time/time.zone/time.zone.db/time.zone.db.list/iterators.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// XFAIL: libcpp-has-no-incomplete-tzdb
1313
// XFAIL: availability-tzdb-missing
1414

15+
// TODO TZDB Enable tests
16+
// UNSUPPORTED: c++20, c++23, c++26
17+
1518
// <chrono>
1619
//
1720
// class tzdb_list;

libcxx/test/std/time/time.zone/time.zone.db/time.zone.db.remote/reload_tzdb.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// XFAIL: libcpp-has-no-incomplete-tzdb
1313
// XFAIL: availability-tzdb-missing
1414

15+
// TODO TZDB Enable tests
16+
// UNSUPPORTED: c++20, c++23, c++26
17+
1518
// <chrono>
1619

1720
// Note there is no Standard way to change the remote database used.

libcxx/test/std/time/time.zone/time.zone.db/time.zone.db.remote/remote_version.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// XFAIL: libcpp-has-no-incomplete-tzdb
1313
// XFAIL: availability-tzdb-missing
1414

15+
// TODO TZDB Enable tests
16+
// UNSUPPORTED: c++20, c++23, c++26
17+
1518
// <chrono>
1619

1720
// const string remote_version();

0 commit comments

Comments
 (0)